From 32b90f9c47ed3a7335044454c3633e5c69eadffa Mon Sep 17 00:00:00 2001 From: Jaehyun Cho Date: Thu, 9 May 2019 14:14:18 +0900 Subject: [PATCH] Remove securevirtualresourcetypes.h from ocpayload OicSecKey_t is used to set/get Payload data. ocpyalod.h do not need to use securevirtualresourcetypes.h file directly. that header is moved to implement file and removed from ocpayload header. https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/commit/546fc54a4fea6ffb1b52d5dbbf88e2b784bebc2b (cherry picked from 546fc54a4fea6ffb1b52d5dbbf88e2b784bebc2b) Change-Id: I520f507624e99d5b0a3ea131f09c6d6f91dddc61 Signed-off-by: Jaehyun Cho Signed-off-by: DoHyun Pyun --- resource/csdk/stack/include/ocpayload.h | 8 ++++---- resource/csdk/stack/src/ocpayload.c | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resource/csdk/stack/include/ocpayload.h b/resource/csdk/stack/include/ocpayload.h index fc11afa..763a107 100644 --- a/resource/csdk/stack/include/ocpayload.h +++ b/resource/csdk/stack/include/ocpayload.h @@ -32,10 +32,6 @@ #include #include "octypes.h" -#if defined(__WITH_TLS__) || defined(__WITH_DTLS__) -#include "securevirtualresourcetypes.h" -#endif - #ifdef __cplusplus extern "C" { @@ -65,6 +61,10 @@ extern "C" typedef struct OCResource OCResource; +#if defined(__WITH_TLS__) || defined(__WITH_DTLS__) +typedef struct OicSecKey OicSecKey_t; +#endif + void OCPayloadDestroy(OCPayload* payload); // Representation Payload diff --git a/resource/csdk/stack/src/ocpayload.c b/resource/csdk/stack/src/ocpayload.c index 95b9440..e31454f 100755 --- a/resource/csdk/stack/src/ocpayload.c +++ b/resource/csdk/stack/src/ocpayload.c @@ -32,6 +32,10 @@ #include "ocresource.h" #include "logger.h" +#if defined(__WITH_TLS__) || defined(__WITH_DTLS__) +#include "securevirtualresourcetypes.h" +#endif + #define TAG "OIC_RI_PAYLOAD" #define CSV_SEPARATOR ',' -- 2.7.4