From 7f8ce3c8dd6ebe587f42c6792baa8d2902342047 Mon Sep 17 00:00:00 2001 From: def Date: Wed, 1 Jul 2015 14:13:06 +0200 Subject: [PATCH] Rename json.cpp to json.c again --- bam.lua | 2 +- src/engine/external/json-parser/{json.cpp => json.c} | 0 src/engine/external/json-parser/json.h | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/engine/external/json-parser/{json.cpp => json.c} (100%) diff --git a/bam.lua b/bam.lua index bb72886fd..1c25e48a4 100644 --- a/bam.lua +++ b/bam.lua @@ -258,7 +258,7 @@ function build(settings) -- build the small libraries wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) - jsonparser = Compile(settings, Collect("src/engine/external/json-parser/*.cpp")) + jsonparser = Compile(settings, Collect("src/engine/external/json-parser/*.c")) md5 = Compile(settings, "src/engine/external/md5/md5.c") if config.websockets.value then libwebsockets = Compile(settings, Collect("src/engine/external/libwebsockets/*.c")) diff --git a/src/engine/external/json-parser/json.cpp b/src/engine/external/json-parser/json.c similarity index 100% rename from src/engine/external/json-parser/json.cpp rename to src/engine/external/json-parser/json.c diff --git a/src/engine/external/json-parser/json.h b/src/engine/external/json-parser/json.h index f11075d31..faf2df76b 100644 --- a/src/engine/external/json-parser/json.h +++ b/src/engine/external/json-parser/json.h @@ -213,7 +213,7 @@ inline const struct _json_value *json_array_get (const json_value * array, int i inline int json_array_length (const json_value * array) { return array->u.array.length; } inline const char * json_string_get (const json_value * string) { return string->u.string.ptr; } inline int json_int_get (const json_value * integer) { return integer->u.integer; } -inline bool json_boolean_get(const json_value * boolean) { return boolean->u.boolean != 0; } +inline int json_boolean_get(const json_value * boolean) { return boolean->u.boolean != 0; } #ifdef __cplusplus } /* extern "C" */