mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'caribou-rtos'

Browse Source
This commit is contained in:
Mike Sharkey
2021-02-12 23:19:58 -05:00
parent 324a6ac9a9 35c1397018
commit 8a31759c59
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cJSON.c
View File

@ -37,13 +37,23 @@
#pragma warning (disable : 4001)
#endif
#include <string.h>
#include <stdio.h>
#include <math.h>
#include <stdlib.h>
#include <limits.h>
#include <ctype.h>
#include <float.h>
#if defined(_CARIBOU_RTOS_)
#include <caribou/lib/string.h>
#include <caribou/lib/stdio.h>
#include <caribou/lib/stddef.h>
#include <caribou/lib/stdint.h>
#include <caribou/lib/heap.h>
#include <math.h>
#include <float.h>
#else
#include <string.h>
#include <stdio.h>
#include <math.h>
#include <stdlib.h>
#include <limits.h>
#include <ctype.h>
#include <float.h>
#endif
#ifdef ENABLE_LOCALES
#include <locale.h>

7
cJSON.h
View File

@ -83,7 +83,12 @@ then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJ
#define CJSON_VERSION_MINOR 7
#define CJSON_VERSION_PATCH 14
#include <stddef.h>
#if defined(_CARIBOU_RTOS_)
#include <caribou/lib/stdint.h>
#include <caribou/lib/stddef.h>
#else
#include <stddef.h>
#endif
/* cJSON Types: */
#define cJSON_Invalid (0)