replace : iotivity -> iotivity-sec

[platform/upstream/iotivity.git] / extlibs / tinycbor / tinycbor / tools / json2cbor / json2cbor.c

diff --git a/extlibs/tinycbor/tinycbor/tools/json2cbor/json2cbor.c b/extlibs/tinycbor/tinycbor/tools/json2cbor/json2cbor.c
index 96d3ed1..d2839f6 100644 (file)
--- a/extlibs/tinycbor/tinycbor/tools/json2cbor/json2cbor.c
+++ b/extlibs/tinycbor/tinycbor/tools/json2cbor/json2cbor.c
@@ -27,7 +27,11 @@
 #include "cbor.h"
 #include "compilersupport_p.h"
 
+#if defined (__TIZENRT__)
+#include <apps/netutils/cJSON.h>
+#else
 #include <cJSON.h>
+#endif
 
 #include <errno.h>
 #include <math.h>
@@ -332,7 +336,7 @@ encode_double:
                 return err;
 
             *encoder = container;   // restore state
-            encoder->data.ptr = newbuffer + (container.data.ptr - buffer);
+            encoder->ptr = newbuffer + (container.ptr - buffer);
             encoder->end = newbuffer + buffersize;
             buffer = newbuffer;
             goto encode_double;
@@ -483,7 +487,7 @@ int main(int argc, char **argv)
         return EXIT_FAILURE;
     }
 
-    fwrite(buffer, 1, encoder.data.ptr - buffer, stdout);
+    fwrite(buffer, 1, encoder.ptr - buffer, stdout);
     free(buffer);
     return EXIT_SUCCESS;
 }