cJSON

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

commit c083421f408f0ee5012dca431baefe8791858a33
parent 96c33e5abbc45ebff2082f380120259dd74b63a2
Author: Max Bruckner <max@maxbruckner.de>
Date:   Sun,  8 Oct 2017 23:36:41 +0200

Release version 1.6.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -1,3 +1,18 @@ +1.6.0 +===== +Features: +--------- +* You can now build cJSON as both shared and static library at once with CMake using `-DBUILD_SHARED_AND_STATIC_LIBS=On`, see #178 +* UTF-8 byte order marks are now ignored, see #184 +* Locales can now be disabled with the option `-DENABLE_LOCALES=Off`, see #202, thanks @Casperinous +* Better support for MSVC and Visual Studio + +Other Changes: +-------------- +* Add the new warnings `-Wswitch-enum`, `-Wused-but-makred-unused`, `-Wmissing-variable-declarations`, `-Wunused-macro` +* More number printing tests. +* Continuous integration testing with AppVeyor (semi automatic at this point), thanks @simon-p-r + 1.5.9 ===== * Set the global error pointer even if `return_parse_end` is passed to `cJSON_ParseWithOpts`. See #200, thanks @rmallins diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -6,8 +6,8 @@ include(GNUInstallDirs) project(cJSON C) set(PROJECT_VERSION_MAJOR 1) -set(PROJECT_VERSION_MINOR 5) -set(PROJECT_VERSION_PATCH 9) +set(PROJECT_VERSION_MINOR 6) +set(PROJECT_VERSION_PATCH 0) 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.9 +LIBVERSION = 1.6.0 CJSON_SOVERSION = 1 UTILS_SOVERSION = 1 diff --git a/cJSON.c b/cJSON.c @@ -74,7 +74,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 != 9) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 6) || (CJSON_VERSION_PATCH != 0) #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 @@ -30,8 +30,8 @@ extern "C" /* project version */ #define CJSON_VERSION_MAJOR 1 -#define CJSON_VERSION_MINOR 5 -#define CJSON_VERSION_PATCH 9 +#define CJSON_VERSION_MINOR 6 +#define CJSON_VERSION_PATCH 0 #include <stddef.h>