Przeglądaj źródła

Release version 1.7.5

Max Bruckner 7 lat temu
rodzic
commit
0e0c463491
5 zmienionych plików z 10 dodań i 4 usunięć
  1. 6 0
      CHANGELOG.md
  2. 1 1
      CMakeLists.txt
  3. 1 1
      Makefile
  4. 1 1
      cJSON.c
  5. 1 1
      cJSON.h

+ 6 - 0
CHANGELOG.md

@@ -1,3 +1,9 @@
+1.7.5
+=====
+Fixes:
+------
+* Fix a bug in the JSON Patch implementation of `cJSON Utils` (see #251), thanks @bobkocisko.
+
 1.7.4
 1.7.4
 =====
 =====
 Fixes:
 Fixes:

+ 1 - 1
CMakeLists.txt

@@ -7,7 +7,7 @@ include(GNUInstallDirs)
 
 
 set(PROJECT_VERSION_MAJOR 1)
 set(PROJECT_VERSION_MAJOR 1)
 set(PROJECT_VERSION_MINOR 7)
 set(PROJECT_VERSION_MINOR 7)
-set(PROJECT_VERSION_PATCH 4)
+set(PROJECT_VERSION_PATCH 5)
 set(CJSON_VERSION_SO 1)
 set(CJSON_VERSION_SO 1)
 set(CJSON_UTILS_VERSION_SO 1)
 set(CJSON_UTILS_VERSION_SO 1)
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")

+ 1 - 1
Makefile

@@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c
 
 
 LDLIBS = -lm
 LDLIBS = -lm
 
 
-LIBVERSION = 1.7.4
+LIBVERSION = 1.7.5
 CJSON_SOVERSION = 1
 CJSON_SOVERSION = 1
 UTILS_SOVERSION = 1
 UTILS_SOVERSION = 1
 
 

+ 1 - 1
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 */
 /* 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 != 4)
+#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 5)
     #error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
     #error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
 #endif
 #endif
 
 

+ 1 - 1
cJSON.h

@@ -31,7 +31,7 @@ extern "C"
 /* project version */
 /* project version */
 #define CJSON_VERSION_MAJOR 1
 #define CJSON_VERSION_MAJOR 1
 #define CJSON_VERSION_MINOR 7
 #define CJSON_VERSION_MINOR 7
-#define CJSON_VERSION_PATCH 4
+#define CJSON_VERSION_PATCH 5
 
 
 #include <stddef.h>
 #include <stddef.h>