Skip to content

Commit a2a2411

Browse files
committed
Release version 1.5.5
1 parent 03ba72f commit a2a2411

File tree

5 files changed

+12
-4
lines changed

5 files changed

+12
-4
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
1.5.5
2+
=====
3+
Fixes:
4+
------
5+
* Fix pointers to nested arrays in cJSON_Utils (9abe75e072050f34732a7169740989a082b65134)
6+
* Fix an error with case sensitivity handling in cJSON_Utils (b9cc911831b0b3e1bb72f142389428e59f882b38)
7+
* Fix cJSON_Compare for arrays that are prefixes of the other and objects that are a subset of the other (03ba72faec115160d1f3aea5582d9b6af5d3e473) See #180, thanks @zhengqb for reporting
8+
19
1.5.4
210
=====
311
Fixes:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ project(cJSON C)
77

88
set(PROJECT_VERSION_MAJOR 1)
99
set(PROJECT_VERSION_MINOR 5)
10-
set(PROJECT_VERSION_PATCH 4)
10+
set(PROJECT_VERSION_PATCH 5)
1111
set(CJSON_VERSION_SO 1)
1212
set(CJSON_UTILS_VERSION_SO 1)
1313
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c
88

99
LDLIBS = -lm
1010

11-
LIBVERSION = 1.5.4
11+
LIBVERSION = 1.5.5
1212
CJSON_SOVERSION = 1
1313
UTILS_SOVERSION = 1
1414

cJSON.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void)
5858
}
5959

6060
/* This is a safeguard to prevent copy-pasters from using incompatible C and header files */
61-
#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 4)
61+
#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 5)
6262
#error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
6363
#endif
6464

cJSON.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extern "C"
3131
/* project version */
3232
#define CJSON_VERSION_MAJOR 1
3333
#define CJSON_VERSION_MINOR 5
34-
#define CJSON_VERSION_PATCH 4
34+
#define CJSON_VERSION_PATCH 5
3535

3636
#include <stddef.h>
3737

0 commit comments

Comments
 (0)