aboutsummaryrefslogtreecommitdiff
path: root/loader
diff options
context:
space:
mode:
authorTony Barbour <tony@LunarG.com>2015-07-13 13:37:24 -0600
committerCourtney Goeltzenleuchter <courtney@LunarG.com>2015-07-17 10:05:22 -0600
commit1e6c516d95f0fe3863fa77a93a3f2e61310fb914 (patch)
tree91536e17a9d90a79bb06586a999761b468cd7bda /loader
parent75594d24f740d36eb30648d7544da155ab85cc35 (diff)
downloadusermoji-1e6c516d95f0fe3863fa77a93a3f2e61310fb914.tar.xz
Windows: More windows compilier fixes
Diffstat (limited to 'loader')
-rw-r--r--loader/cJSON.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/loader/cJSON.c b/loader/cJSON.c
index a330f694..2d55207b 100644
--- a/loader/cJSON.c
+++ b/loader/cJSON.c
@@ -135,7 +135,7 @@ static char* ensure(printbuffer *p,int needed)
return newbuffer+p->offset;
}
-static int update(printbuffer *p)
+static size_t update(printbuffer *p)
{
char *str;
if (!p || !p->buffer) return 0;
@@ -251,7 +251,7 @@ static const char *parse_string(cJSON *item,const char *str)
/* Render the cstring provided to an escaped version that can be printed. */
static char *print_string_ptr(const char *str,printbuffer *p)
{
- const char *ptr;char *ptr2,*out;int len=0,flag=0;unsigned char token;
+ const char *ptr;char *ptr2,*out;size_t len=0,flag=0;unsigned char token;
for (ptr=str;*ptr;ptr++) flag|=((*ptr>0 && *ptr<32)||(*ptr=='\"')||(*ptr=='\\'))?1:0;
if (!flag)
@@ -434,7 +434,7 @@ static const char *parse_array(cJSON *item,const char *value)
static char *print_array(cJSON *item,int depth,int fmt,printbuffer *p)
{
char **entries;
- char *out=0,*ptr,*ret;int len=5;
+ char *out=0,*ptr,*ret;size_t len=5;
cJSON *child=item->child;
int numentries=0,i=0,fail=0;
size_t tmplen=0;