* Don't use this as a variable, so we can compile with a C++ compiler
* Add casts from void* to type of assignment when using malloc
* Add #ifdef __cplusplus guards to all of the headers
* Add typedefs for json_object, json_tokener, array_list, printbuf, lh_table
Michael Clark, <michael@metaparadigm.com>
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@33 327403b1-1117-474d-bef2-5cb71233fd97
diff --git a/json_tokener.c b/json_tokener.c
index 9c05728..beaa956 100644
--- a/json_tokener.c
+++ b/json_tokener.c
@@ -57,7 +57,9 @@
struct json_tokener* json_tokener_new(void)
{
- struct json_tokener *tok = calloc(1, sizeof(struct json_tokener));
+ struct json_tokener *tok;
+
+ tok = (struct json_tokener*)calloc(1, sizeof(struct json_tokener));
tok->pb = printbuf_new();
json_tokener_reset(tok);
return tok;
@@ -100,7 +102,7 @@
tok = json_tokener_new();
obj = json_tokener_parse_ex(tok, str, -1);
if(tok->err != json_tokener_success)
- obj = error_ptr(-tok->err);
+ obj = (struct json_object*)error_ptr(-tok->err);
json_tokener_free(tok);
return obj;
}