From 4d4a751e75ce2b83e96a0a47ecb49a1161d56071 Mon Sep 17 00:00:00 2001 From: Jordan Cristiano Date: Mon, 31 Aug 2015 22:14:49 -0400 Subject: [PATCH] Changed json_checker to cpp file to fix clang build --- .../{JSON_checker.c => JSON_checker.cpp} | 6 ++---- .../include/json_checker/JSON_checker.h | 13 +++---------- premake/premake5.lua | 3 +-- 3 files changed, 6 insertions(+), 16 deletions(-) rename external/json_checker/{JSON_checker.c => JSON_checker.cpp} (99%) diff --git a/external/json_checker/JSON_checker.c b/external/json_checker/JSON_checker.cpp similarity index 99% rename from external/json_checker/JSON_checker.c rename to external/json_checker/JSON_checker.cpp index ad0d3e1..b3552e2 100644 --- a/external/json_checker/JSON_checker.c +++ b/external/json_checker/JSON_checker.cpp @@ -29,8 +29,6 @@ SOFTWARE. #include #include "json_checker/JSON_checker.h" -#define true 1 -#define false 0 #define __ -1 /* the universal error code */ /* @@ -258,7 +256,7 @@ new_JSON_checker(int depth) } -int +bool JSON_checker_char(JSON_checker jc, int next_char) { /* @@ -385,7 +383,7 @@ JSON_checker_char(JSON_checker jc, int next_char) } -int +bool JSON_checker_done(JSON_checker jc) { /* diff --git a/external/json_checker/include/json_checker/JSON_checker.h b/external/json_checker/include/json_checker/JSON_checker.h index f577aee..5a7be32 100644 --- a/external/json_checker/include/json_checker/JSON_checker.h +++ b/external/json_checker/include/json_checker/JSON_checker.h @@ -3,10 +3,6 @@ /* JSON_checker.h */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - typedef struct JSON_checker_struct { int state; int depth; @@ -15,10 +11,7 @@ typedef struct JSON_checker_struct { } * JSON_checker; -extern JSON_checker new_JSON_checker(int depth); -extern int JSON_checker_char(JSON_checker jc, int next_char); -extern int JSON_checker_done(JSON_checker jc); +JSON_checker new_JSON_checker(int depth); +bool JSON_checker_char(JSON_checker jc, int next_char); +bool JSON_checker_done(JSON_checker jc); -#ifdef __cplusplus -} /* extern "C" */ -#endif /* __cplusplus */ diff --git a/premake/premake5.lua b/premake/premake5.lua index 61b3315..5a3ccfd 100644 --- a/premake/premake5.lua +++ b/premake/premake5.lua @@ -23,8 +23,7 @@ solution "demboyz" "../demboyz/**.h", "../demboyz/**.cpp", "../external/**.h", - "../external/**.cpp", - "../external/**.c" + "../external/**.cpp" } includedirs {