Sync with what we had in Zephyr ext/

We had a few changes in the zephyr tree that were not synced with the
zephyr branch of the tinycbor tree.

Signed-off-by: Anas Nashif <[email protected]>

Author: nashif

src/cbor.h

@@ -37,6 +37,7 @@
 #include "cbor_buf_writer.h"
 #include "cbor_buf_reader.h"
 #include "tinycbor-version.h"
+#include "config.h"
 
 #define TINYCBOR_VERSION            ((TINYCBOR_VERSION_MAJOR << 16) | (TINYCBOR_VERSION_MINOR << 8) | TINYCBOR_VERSION_PATCH)
 

src/cbortojson.c

@@ -403,7 +403,7 @@ static CborError stringify_map_key(char **key, CborValue *it, int flags, CborTyp
 {
     (void)flags;    /* unused */
     (void)type;     /* unused */
-#ifdef CBOR_WITHOUT_OPEN_MEMSTREAM
+#ifdef WITHOUT_OPEN_MEMSTREAM
     (void)key;      /* unused */
     (void)it;       /* unused */
     return CborErrorJsonNotImplemented;