cJSON

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

commit 3d6ae1134051c2b4bf9ccf5e1e3ca998f398f024
parent a1f2600883f9d80139b81c7408ddc28d0f7f6301
Author: Max Bruckner <max@maxbruckner.de>
Date:   Thu, 15 Dec 2016 19:43:32 +0100

Make cJSON C++ compatible

Diffstat:
MCMakeLists.txt | 2+-
MMakefile | 2+-
Mtest.c | 4++--
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt @@ -15,7 +15,7 @@ set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT option(ENABLE_CUSTOM_COMPILER_FLAGS "Enables custom compiler flags for Clang and GCC" ON) if (ENABLE_CUSTOM_COMPILER_FLAGS) if(("${CMAKE_C_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89 -pedantic -Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wshadow -Winit-self -Wcast-align -Wformat=2 -Wmissing-prototypes -Wstrict-overflow=2 -Wcast-qual") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89 -pedantic -Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wshadow -Winit-self -Wcast-align -Wformat=2 -Wmissing-prototypes -Wstrict-overflow=2 -Wcast-qual -Wc++-compat") endif() endif() diff --git a/Makefile b/Makefile @@ -23,7 +23,7 @@ INSTALL_LIBRARY_PATH = $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH) INSTALL ?= cp -a -R_CFLAGS = -fPIC -std=c89 -pedantic -Wall -Werror -Wstrict-prototypes -Wwrite-strings -Wshadow -Winit-self -Wcast-align -Wformat=2 -Wmissing-prototypes -Wstrict-overflow=2 -Wcast-qual $(CFLAGS) +R_CFLAGS = -fPIC -std=c89 -pedantic -Wall -Werror -Wstrict-prototypes -Wwrite-strings -Wshadow -Winit-self -Wcast-align -Wformat=2 -Wmissing-prototypes -Wstrict-overflow=2 -Wcast-qual -Wc++-compat $(CFLAGS) uname := $(shell sh -c 'uname -s 2>/dev/null || echo false') diff --git a/test.c b/test.c @@ -106,7 +106,7 @@ static int print_preallocated(cJSON *root) /* create buffer to succeed */ /* the extra 64 bytes are in case a floating point value is printed */ len = strlen(out) + 64; - buf = malloc(len); + buf = (char*)malloc(len); if (buf == NULL) { printf("Failed to allocate memory.\n"); @@ -115,7 +115,7 @@ static int print_preallocated(cJSON *root) /* create buffer to fail */ len_fail = strlen(out); - buf_fail = malloc(len_fail); + buf_fail = (char*)malloc(len_fail); if (buf_fail == NULL) { printf("Failed to allocate memory.\n");