Merge branch '1.3'

[jansson.git] / src / load.c

diff --git a/src/load.c b/src/load.c
index 0576080..925a850 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -401,7 +401,7 @@ out:
     free(lex->value.string);
 }
 
-#ifdef JSON_INTEGER_IS_LONG_LONG
+#if JSON_INTEGER_IS_LONG_LONG
 #define json_strtoint     strtoll
 #else
 #define json_strtoint     strtol
@@ -817,10 +817,7 @@ json_t *json_loads(const char *string, size_t flags, json_error_t *error)
     json_t *result;
     (void)flags; /* unused */
 
-    string_data_t stream_data = {
-        .data = string,
-        .pos = 0
-    };
+    string_data_t stream_data = {string, 0};
 
     if(lex_init(&lex, string_get, string_eof, (void *)&stream_data))
         return NULL;