From 99db5db9a4384cfa4c65ce4b6471005bfd0f8013 Mon Sep 17 00:00:00 2001 From: Max Bruckner Date: Sat, 8 Apr 2017 17:54:55 +0200 Subject: [PATCH] Release version 1.4.6 --- CMakeLists.txt | 2 +- Makefile | 2 +- cJSON.c | 2 +- cJSON.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a9c9df0..9a8d14a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(cJSON C) set(PROJECT_VERSION_MAJOR 1) set(PROJECT_VERSION_MINOR 4) -set(PROJECT_VERSION_PATCH 5) +set(PROJECT_VERSION_PATCH 6) 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 a11000b..cc9dedd 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ UTILS_TEST_SRC = cJSON.c cJSON_Utils.c test_utils.c LDLIBS = -lm -LIBVERSION = 1.4.5 +LIBVERSION = 1.4.6 CJSON_SOVERSION = 1 UTILS_SOVERSION = 1 diff --git a/cJSON.c b/cJSON.c index 581b2f6..fca22c6 100644 --- a/cJSON.c +++ b/cJSON.c @@ -48,7 +48,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 != 4) || (CJSON_VERSION_PATCH != 5) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 4) || (CJSON_VERSION_PATCH != 6) #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 1c44709..040511e 100644 --- a/cJSON.h +++ b/cJSON.h @@ -31,7 +31,7 @@ extern "C" /* project version */ #define CJSON_VERSION_MAJOR 1 #define CJSON_VERSION_MINOR 4 -#define CJSON_VERSION_PATCH 5 +#define CJSON_VERSION_PATCH 6 #include -- GitLab