diff --git a/CHANGELOG.md b/CHANGELOG.md index a7c5f3d6a7d04afaf74e7cd912e83d532a41da4c..8debcdf3ee21e79d9d4b4a33c92c7ecdc2c59fd9 100644 --- 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 index b5c6b5b2bbc7e1f846aea62dd79da86d1ea310bb..033a88289db400c528cd5c12ec151a95b78ac6da 100644 --- 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 index 33ecb2e61db33dcfa74bd28670d32cf800c2d541..8d64fd23b8ed4ce4e3debc17c483c6aa03fb5237 100644 --- 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 index e8a62b317fe43653e9131f736ea42f47ca5a3165..74df6ec7a1d0b44f4c8b2849cdae9dcd4c6fd2a5 100644 --- 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 index ec572ecb151bdd7a3221012c1ef54ee3f971ddb8..3279f6ba5d80373625992b860e78d1aba5081183 100644 --- 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