cJSON

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

commit cbc05de76fbd4dfff17b5626d5cfe9ec922b1f4a
parent 7996a4a2eeee6339703259e799c42814ccf79daa
Author: Max Bruckner <max@maxbruckner.de>
Date:   Fri, 13 Apr 2018 12:32:30 +0800

Release version 1.7.6

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

diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -1,3 +1,14 @@ +1.7.6 +===== +Fixes: +------ +* Add `SONAME` to the ELF files built by the Makefile (see #252), thanks @YanhaoMo for reporting +* Add include guards and `extern "C"` to `cJSON_Utils.h` (see #256), thanks @daschfg for reporting + +Other changes: +-------------- +* Mark the Makefile as deprecated in the README. + 1.7.5 ===== Fixes: diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -7,7 +7,7 @@ include(GNUInstallDirs) set(PROJECT_VERSION_MAJOR 1) set(PROJECT_VERSION_MINOR 7) -set(PROJECT_VERSION_PATCH 5) +set(PROJECT_VERSION_PATCH 6) 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.7.5 +LIBVERSION = 1.7.6 CJSON_SOVERSION = 1 UTILS_SOVERSION = 1 diff --git a/cJSON.c b/cJSON.c @@ -82,7 +82,7 @@ CJSON_PUBLIC(char *) cJSON_GetStringValue(cJSON *item) { } /* This is a safeguard to prevent copy-pasters from using incompatible C and header files */ -#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 5) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 6) #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 7 -#define CJSON_VERSION_PATCH 5 +#define CJSON_VERSION_PATCH 6 #include <stddef.h>