OSDN Git Service
(root)
/
proj16
/
16.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5f78097
)
new jsmn issue oopsie
author
sparky4
<sparky4@cock.li>
Tue, 23 Apr 2019 21:52:39 +0000
(16:52 -0500)
committer
sparky4
<sparky4@cock.li>
Tue, 23 Apr 2019 21:52:39 +0000
(16:52 -0500)
src/lib/16_map.h
patch
|
blob
|
history
src/lib/jsmn
patch
|
blob
|
history
diff --git
a/src/lib/16_map.h
b/src/lib/16_map.h
index
3e13357
..
f99193b
100755
(executable)
--- a/
src/lib/16_map.h
+++ b/
src/lib/16_map.h
@@
-43,9
+43,6
@@
\r
//typedefs moved to 16_tdef.h
\r
\r
-void jsmn_init(jsmn_parser *parser);
\r
-int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len, jsmntok_t *tokens, const unsigned int num_tokens);
\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
diff --git
a/src/lib/jsmn
b/src/lib/jsmn
index
fdcef3e
..
18e9fe4
160000
(submodule)
--- a/
src/lib/jsmn
+++ b/
src/lib/jsmn
@@
-1
+1
@@
-Subproject commit
fdcef3ebf886fa210d14956d3c068a653e76a24e
+Subproject commit
18e9fe42cbfe21d65076f5c77ae2be379ad1270f