cJSON

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

commit 6c9f76c1002a9bb9685db82fbaf1c2f9f34e7055
parent 2c9947eec925a49d42d011eba39f500d71f448b8
Author: Max Bruckner <max@maxbruckner.de>
Date:   Sat,  6 May 2017 08:42:59 +0200

Release version 1.5.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -1,3 +1,10 @@ +1.5.1 +===== +Fixes: +------ +* Add gcc version guard to the Makefile (#164), thanks @juvasquezg +* Fix incorrect free in `cJSON_Utils` if custom memory allocator is used (#166), thanks @prefetchnta + 1.5.0 ===== Features: 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 0) +set(PROJECT_VERSION_PATCH 1) 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.0 +LIBVERSION = 1.5.1 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 != 0) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 1) #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 0 +#define CJSON_VERSION_PATCH 1 #include <stddef.h>