From 4e9a30bba341d864825e113c6f1316cffc5c2c15 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 17 Nov 2019 00:53:16 +0800 Subject: [PATCH] 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 (cherry picked from commit 98c868360c858f4c5fd466bd03fd157ac56b3f06) Signed-off-by: Bruce A. Mah --- src/cjson.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/cjson.c b/src/cjson.c index a31874dbf..e692e6975 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 {