From e5fe65f58a62d8678b57e96c8e14a06d3ebcb20a Mon Sep 17 00:00:00 2001 From: Dave Gamble Date: Wed, 9 Sep 2009 18:56:31 +0000 Subject: [PATCH] ...try that again... better WINDOWS/WIN32/__WIN32__ (for Borland C) sentinelling also missed the casts on realloc() git-svn-id: http://svn.code.sf.net/p/cjson/code@6 e3330c51-1366-4df0-8b21-3ccf24e3d50e --- cJSON.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cJSON.c b/cJSON.c index 63348a2..909c6e5 100644 --- a/cJSON.c +++ b/cJSON.c @@ -30,7 +30,7 @@ #include #include "cJSON.h" -#ifdef WINDOWS +#if defined(WINDOWS) || defined(__WIN32__) || defined(WIN32) #define strcasecmp stricmp #endif @@ -263,7 +263,7 @@ static char *print_array(cJSON *item,int depth) ret=print_value(child,depth+1); if (!ret) {free(out);return 0;} // Check for failure! len+=strlen(ret)+3; - out=realloc(out,len); + out=(char*)realloc(out,len); ptr=out+strlen(out); ptr+=sprintf(ptr,ret); if (child->next) {*ptr++=',';*ptr++=' ';*ptr=0;} @@ -320,7 +320,7 @@ static char *print_object(cJSON *item,int depth) ret=print_value(child,depth); if (!ret) {free(out);return 0;} // Check for failure! len+=strlen(ret)+strlen(str)+4+depth; - out=realloc(out,len); + out=(char*)realloc(out,len); ptr=out+strlen(out); for (i=0;i