RepoMirrors/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON synced 2024-12-24 23:52:07 +00:00
Code Issues Releases Wiki Activity

Make cJSON C++ compatible

Browse Source
This commit is contained in:
Max Bruckner 2016-12-15 19:43:32 +01:00
parent a1f2600883
commit 3d6ae11340
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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) option(ENABLE_CUSTOM_COMPILER_FLAGS "Enables custom compiler flags for Clang and GCC" ON)
if (ENABLE_CUSTOM_COMPILER_FLAGS) if (ENABLE_CUSTOM_COMPILER_FLAGS)
if(("${CMAKE_C_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")) 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()
endif() endif()

2
Makefile
View File

@ -23,7 +23,7 @@ INSTALL_LIBRARY_PATH = $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
INSTALL ?= cp -a 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') uname := $(shell sh -c 'uname -s 2>/dev/null || echo false')

4
test.c
View File

@ -106,7 +106,7 @@ static int print_preallocated(cJSON *root)
/* create buffer to succeed */ /* create buffer to succeed */
/* the extra 64 bytes are in case a floating point value is printed */ /* the extra 64 bytes are in case a floating point value is printed */
len = strlen(out) + 64; len = strlen(out) + 64;
buf = malloc(len); buf = (char*)malloc(len);
if (buf == NULL) if (buf == NULL)
{ {
printf("Failed to allocate memory.\n"); printf("Failed to allocate memory.\n");
@ -115,7 +115,7 @@ static int print_preallocated(cJSON *root)
/* create buffer to fail */ /* create buffer to fail */
len_fail = strlen(out); len_fail = strlen(out);
buf_fail = malloc(len_fail); buf_fail = (char*)malloc(len_fail);
if (buf_fail == NULL) if (buf_fail == NULL)
{ {
printf("Failed to allocate memory.\n"); printf("Failed to allocate memory.\n");