cJSON

mirror of Dave's cJSON
git clone git://git.thc420.xyz/cJSON
Log | Files | Refs | README | LICENSE

commit 9189b3322aa4ec038aa7311a40da633ae7a9960a
parent bfbd8fe0d85f1dd21e508748fc10fc4c27cc51be
Author: Max Bruckner <max@maxbruckner.de>
Date:   Sun,  4 Jun 2017 21:31:45 +0200

Release v1.5.4

Diffstat:
MCHANGELOG.md | 10++++++++++
MCMakeLists.txt | 2+-
MMakefile | 2+-
McJSON.c | 2+-
McJSON.h | 2+-
5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -1,3 +1,13 @@ +1.5.4 +===== +Fixes: +------ +* Fix build with GCC 7.1.1 and optimization level `-O2` (bfbd8fe0d85f1dd21e508748fc10fc4c27cc51be) + +Other Changes: +-------------- +* Update [Unity](https://github.com/ThrowTheSwitch/Unity) to 3b69beaa58efc41bbbef70a32a46893cae02719d + 1.5.3 ===== Fixes: diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -7,7 +7,7 @@ project(cJSON C) set(PROJECT_VERSION_MAJOR 1) set(PROJECT_VERSION_MINOR 5) -set(PROJECT_VERSION_PATCH 3) +set(PROJECT_VERSION_PATCH 4) set(CJSON_VERSION_SO 1) set(CJSON_UTILS_VERSION_SO 1) set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") diff --git a/Makefile b/Makefile @@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c LDLIBS = -lm -LIBVERSION = 1.5.3 +LIBVERSION = 1.5.4 CJSON_SOVERSION = 1 UTILS_SOVERSION = 1 diff --git a/cJSON.c b/cJSON.c @@ -58,7 +58,7 @@ CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void) } /* This is a safeguard to prevent copy-pasters from using incompatible C and header files */ -#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 3) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 4) #error cJSON.h and cJSON.c have different versions. Make sure that both have the same. #endif diff --git a/cJSON.h b/cJSON.h @@ -31,7 +31,7 @@ extern "C" /* project version */ #define CJSON_VERSION_MAJOR 1 #define CJSON_VERSION_MINOR 5 -#define CJSON_VERSION_PATCH 3 +#define CJSON_VERSION_PATCH 4 #include <stddef.h>