got the jsmn library issue sorted out

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index dad025f7c8eb4c3f858700da06fecf0a09634887..afb8ff0ad5d4a348af1df2a054ab9317f66e2e92 100755 (executable)
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -23,6 +23,8 @@
 //TODO USE CA AND THIS FILE FORMAT\r
 \r
 #include "src/lib/16_map.h"\r
+#define JSMN_STATIC\r
+#include "src/lib/jsmn/jsmn.h"\r
 #include <malloc.h>\r
 \r
 // Ideally, preprocess json during compilation and read serialized data\r

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index f99193b52097e70b7f8b0b697fd0de8377863ef9..d40701db85772b40f8bf1a4c26192112b2ba6f56 100755 (executable)
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -23,17 +23,18 @@
 #ifndef _16_MAP__H_\r
 #define _16_MAP__H_\r
 \r
-#define JSMN_STATIC\r
-\r
 #include "src/lib/16_head.h"\r
+#include "src/lib/16_tail.h"\r
 #include "src/lib/16_tdef.h"\r
-#include "src/lib/jsmn/jsmn.h"\r
 //#include "stdio.h" included in 16_head.h\r
 //#include "stdlib.h" included in 16_head.h\r
 #include "src/lib/16_vl.h"\r
 #include "src/lib/16_ca.h"\r
 #include "src/lib/16_mm.h"\r
 #include "src/lib/16_pm.h"\r
+/*#define JSMN_STATIC\r
+#include "src/lib/jsmn/jsmn.h"\r
+*/\r
 \r
 \r
 //#define DEBUG_MAPDATA\r
@@ -43,7 +44,6 @@
 \r
 //typedefs moved to 16_tdef.h\r
 \r
-int jsoneq(const char *json, jsmntok_t *tok, const char *s);\r
 //word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q);\r
 //int loadmap(char *mn, map_t *map, global_game_variables_t *gvar);\r
 int newloadmap(char *mn, map_t *map);\r