cJSON

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

commit c69134d01746dcf551dd7724b4edb12f922eb0d1
parent 563d861f921492dae64e810c6673c991f1d2d3e2
Author: Max Bruckner <max@maxbruckner.de>
Date:   Thu, 20 Dec 2018 18:15:05 +0100

Release Version 1.7.10

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.7.10 +====== +Fixes: +------ +* Fix package config file for `libcjson`. Thanks @shiluotang for reporting (#321) +* Correctly split lists in `cJSON_Utils`'s merge sort. Thanks @andysCaplin for the fix (#322) + 1.7.9 ===== 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 9) +set(PROJECT_VERSION_PATCH 10) 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.9 +LIBVERSION = 1.7.10 CJSON_SOVERSION = 1 UTILS_SOVERSION = 1 diff --git a/cJSON.c b/cJSON.c @@ -81,7 +81,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 != 9) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 10) #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 @@ -81,7 +81,7 @@ then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJ /* project version */ #define CJSON_VERSION_MAJOR 1 #define CJSON_VERSION_MINOR 7 -#define CJSON_VERSION_PATCH 9 +#define CJSON_VERSION_PATCH 10 #include <stddef.h>