cJSON

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

commit 1217ca9e9f0134fe4666b3c81771af545c4c1b9d
parent 6e9c6edd9140a43e95aa5dc7b887b189ad2be66c
Author: Max Bruckner <max@maxbruckner.de>
Date:   Tue,  2 May 2017 02:34:55 +0200

Release version 1.5.0

Diffstat:
MCMakeLists.txt | 4++--
MMakefile | 2+-
McJSON.c | 2+-
McJSON.h | 4++--
4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -6,8 +6,8 @@ include(GNUInstallDirs) project(cJSON C) set(PROJECT_VERSION_MAJOR 1) -set(PROJECT_VERSION_MINOR 4) -set(PROJECT_VERSION_PATCH 7) +set(PROJECT_VERSION_MINOR 5) +set(PROJECT_VERSION_PATCH 0) 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.4.7 +LIBVERSION = 1.5.0 CJSON_SOVERSION = 1 UTILS_SOVERSION = 1 diff --git a/cJSON.c b/cJSON.c @@ -58,7 +58,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 != 7) +#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 5) || (CJSON_VERSION_PATCH != 0) #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 @@ -30,8 +30,8 @@ extern "C" /* project version */ #define CJSON_VERSION_MAJOR 1 -#define CJSON_VERSION_MINOR 4 -#define CJSON_VERSION_PATCH 7 +#define CJSON_VERSION_MINOR 5 +#define CJSON_VERSION_PATCH 0 #include <stddef.h>