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 <jaehyun3.cho@samsung.com>
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/resource/csdk/stack/include/ocpayload.h b/resource/csdk/stack/include/ocpayload.h
index fc11afabfb3c234aaec3ab8cb17904278f7372bf..763a10752574d7c8003f1f183896e00c552f8966 100644 (file)
--- a/resource/csdk/stack/include/ocpayload.h
+++ b/resource/csdk/stack/include/ocpayload.h
@@ -32,10 +32,6 @@
 #include <inttypes.h>
 #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 95b94406a1a345937d05e475ec1e69b106ea2f0a..e31454f3d2b8a95b9c87b4b2910de4da330e6e2f 100755 (executable)
--- 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 ','