From: sparky4 <sparky4@cock.li>
Date: Wed, 24 Apr 2019 16:03:05 +0000 (-0500)
Subject: got the jsmn library issue sorted out
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=00dbe7960ddbd83c208fe1e02cfcd2910fa0cb84;p=16.git

got the jsmn library issue sorted out
---

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index dad025f7..afb8ff0a 100755
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -23,6 +23,8 @@
 //TODO USE CA AND THIS FILE FORMAT
 
 #include "src/lib/16_map.h"
+#define JSMN_STATIC
+#include "src/lib/jsmn/jsmn.h"
 #include <malloc.h>
 
 // Ideally, preprocess json during compilation and read serialized data
diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index f99193b5..d40701db 100755
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -23,17 +23,18 @@
 #ifndef _16_MAP__H_
 #define _16_MAP__H_
 
-#define JSMN_STATIC
-
 #include "src/lib/16_head.h"
+#include "src/lib/16_tail.h"
 #include "src/lib/16_tdef.h"
-#include "src/lib/jsmn/jsmn.h"
 //#include "stdio.h" included in 16_head.h
 //#include "stdlib.h" included in 16_head.h
 #include "src/lib/16_vl.h"
 #include "src/lib/16_ca.h"
 #include "src/lib/16_mm.h"
 #include "src/lib/16_pm.h"
+/*#define JSMN_STATIC
+#include "src/lib/jsmn/jsmn.h"
+*/
 
 
 //#define DEBUG_MAPDATA
@@ -43,7 +44,6 @@
 
 //typedefs moved to 16_tdef.h
 
-int jsoneq(const char *json, jsmntok_t *tok, const char *s);
 //word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q);
 //int loadmap(char *mn, map_t *map, global_game_variables_t *gvar);
 int newloadmap(char *mn, map_t *map);