kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-05 10:08:08 +00:00
Code Issues Projects Releases Wiki Activity

FS-10167: Separate commit for fixed to have cJSON compile cleanly, and be able to push commit upstream easily.

Browse Source
This commit is contained in:
Shane Bryldt 2017-03-23 11:50:51 -06:00
parent 17f3daa7c3
commit 4eed255acb
1 changed files with 24 additions and 3 deletions

27
libs/libks/src/cJSON.c

@ -79,6 +79,21 @@ static int cJSON_strcasecmp(const unsigned char *s1, const unsigned char *s2)
return tolower(*s1) - tolower(*s2); return tolower(*s1) - tolower(*s2);
} }
static void *glue_malloc(size_t theSize)
{
return malloc(theSize);
}
static void glue_free(void *thePtr)
{
free(thePtr);
}
static void *glue_realloc(void *pointer, size_t theSize)
{
return realloc(pointer, theSize);
}
typedef struct internal_hooks typedef struct internal_hooks
{ {
void *(*allocate)(size_t size); void *(*allocate)(size_t size);
@ -86,7 +101,7 @@ typedef struct internal_hooks
void *(*reallocate)(void *pointer, size_t size); void *(*reallocate)(void *pointer, size_t size);
} internal_hooks; } internal_hooks;
static internal_hooks global_hooks = { malloc, free, realloc }; static internal_hooks global_hooks = { glue_malloc, glue_free, glue_realloc };
static unsigned char* cJSON_strdup(const unsigned char* str, const internal_hooks * const hooks) static unsigned char* cJSON_strdup(const unsigned char* str, const internal_hooks * const hooks)
{ {
@ -847,7 +862,9 @@ CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value)
return cJSON_ParseWithOpts(value, 0, 0); return cJSON_ParseWithOpts(value, 0, 0);
} }
#ifndef min
#define min(a, b) ((a < b) ? a : b) #define min(a, b) ((a < b) ? a : b)
#endif
static unsigned char *print(const cJSON * const item, cjbool format, const internal_hooks * const hooks) static unsigned char *print(const cJSON * const item, cjbool format, const internal_hooks * const hooks)
{ {
@ -1558,11 +1575,15 @@ CJSON_PUBLIC(void) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJ
{ {
global_hooks.deallocate(item->string); global_hooks.deallocate(item->string);
} }
#ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcast-qual" #pragma GCC diagnostic ignored "-Wcast-qual"
item->string = (char*)string; #endif
item->string = (char*)string;
#ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
item->type |= cJSON_StringIsConst; #endif
item->type |= cJSON_StringIsConst;
cJSON_AddItemToArray(object, item); cJSON_AddItemToArray(object, item);
} }