diff options
| author | Mark Young <marky@lunarg.com> | 2016-06-30 13:02:42 -0600 |
|---|---|---|
| committer | Mark Young <marky@lunarg.com> | 2016-06-30 13:22:48 -0600 |
| commit | 32a03daf7f6ad1f42bd213b43ba935d6629118c6 (patch) | |
| tree | af2b9fe1b5ef1adbc43fc2ffd58bccde1d072a7d /loader/cJSON.c | |
| parent | 00841d30978d944ecffa5723a09312e07de6846f (diff) | |
| download | usermoji-32a03daf7f6ad1f42bd213b43ba935d6629118c6.tar.xz | |
loader: GH370 - re-enable allocator usage
This reverts commit 5876cc2b7563f909c8ac8cb49f51f7ef715877f8.
This adds the previous fixes as well as additional fixes if Implicit
layers aren't present. This is not a case that gets tested on Windows
as most SDK installs have at least 1 Implicit layer (RenderDoc).
This change passes an individual run on Jenkins Linux system.
Change-Id: I466cc54b72946e2a9f6477bd4c3d4e4e72eb9579
Diffstat (limited to 'loader/cJSON.c')
| -rw-r--r-- | loader/cJSON.c | 4 |
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) { |