mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-02 20:09:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #579 from besser82/topic/besser82/strict-prototypes

Browse Source 
Enforce strict prototypes.
This commit is contained in:
Eric Haszlakiewicz
2020-04-14 10:25:13 -04:00
committed by GitHub
parent 4742a2ab1d d0dc3489dc
commit 511edb51a4
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -240,6 +240,7 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wwrite-strings")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-prototypes")
add_definitions(-D_GNU_SOURCE) add_definitions(-D_GNU_SOURCE)
elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")

2
json_object.c
View File

@@ -1373,7 +1373,7 @@ static int json_array_equal(struct json_object *jso1, struct json_object *jso2)
return 1; return 1;
} }
struct json_object *json_object_new_null() struct json_object *json_object_new_null(void)
{ {
return NULL; return NULL;
} }

2
json_object.h
View File

@@ -940,7 +940,7 @@ JSON_EXPORT int json_object_set_string_len(json_object *obj, const char *new_val
* along the lines of the other json_object_new_* functions. * along the lines of the other json_object_new_* functions.
* It always returns NULL, and it is entirely acceptable to simply use NULL directly. * It always returns NULL, and it is entirely acceptable to simply use NULL directly.
*/ */
JSON_EXPORT struct json_object *json_object_new_null(); JSON_EXPORT struct json_object *json_object_new_null(void);
/** Check if two json_object's are equal /** Check if two json_object's are equal
* *