diff options
| author | Xiang Xiao <xiaoxiang@xiaomi.com> | 2019-11-17 00:53:16 +0800 |
|---|---|---|
| committer | Bruce A. Mah <bmah@es.net> | 2020-01-03 13:47:44 -0800 |
| commit | 4e9a30bba341d864825e113c6f1316cffc5c2c15 (patch) | |
| tree | 22c323499db2f35a7854e1794cb8fa7b8a2183d1 /src | |
| parent | 63439867961fdee0d9bda9ef8fa76b69f523d236 (diff) | |
| download | iperf3-4e9a30bba341d864825e113c6f1316cffc5c2c15.tar.gz | |
fix cjson warning: "true" and "false redefined
the similar change also exist in the offical git:
https://github.com/DaveGamble/cJSON
Part of #935.
Change-Id: I3d98de3ec893ccf0b0cab37acc2dbfef00d9e2b6
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
(cherry picked from commit 98c868360c858f4c5fd466bd03fd157ac56b3f06)
Signed-off-by: Bruce A. Mah <bmah@es.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/cjson.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/cjson.c b/src/cjson.c index a31874d..e692e69 100644 --- a/src/cjson.c +++ b/src/cjson.c @@ -47,7 +47,14 @@ #include "cjson.h" /* define our own boolean type */ +#ifdef true +#undef true +#endif #define true ((cJSON_bool)1) + +#ifdef false +#undef false +#endif #define false ((cJSON_bool)0) typedef struct { |