aboutsummaryrefslogtreecommitdiff
path: root/loader/cJSON.c
diff options
context:
space:
mode:
authorMark Young <marky@lunarg.com>2016-06-29 18:33:53 -0600
committerMark Young <marky@lunarg.com>2016-06-29 18:45:22 -0600
commit34b0129554078322aef9ec03eb1733fc9c825f7b (patch)
tree72060516b943110cc89e3692f9f0d2d00c442868 /loader/cJSON.c
parent9a78abed622bbc78c1431c6663f5895099ca270e (diff)
downloadusermoji-34b0129554078322aef9ec03eb1733fc9c825f7b.tar.xz
loader: GH370 - re-enable allocator usage
Re-enable reverted changes done in commit d6f491b88eaf11f6953c02638d079f6a76806658. But also include fixes for the Linux and Windows release runs. Change-Id: I7644bb305faab068b3229eb9c1d8a67b052af165
Diffstat (limited to 'loader/cJSON.c')
-rw-r--r--loader/cJSON.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/loader/cJSON.c b/loader/cJSON.c
index fc3ba049..e7266c38 100644
--- a/loader/cJSON.c
+++ b/loader/cJSON.c
@@ -88,6 +88,10 @@ void cJSON_Delete(cJSON *c) {
}
}
+void cJSON_Free(void *p) {
+ cJSON_free(p);
+}
+
/* Parse the input text to generate a number, and populate the result into item.
*/
static const char *parse_number(cJSON *item, const char *num) {