From 53f56714e2d3acf8b98293c2b5327806bd80d9be Mon Sep 17 00:00:00 2001 From: Jeff McBride Date: Tue, 5 Jun 2018 17:14:13 +0000 Subject: [PATCH] Add JSON_IS_AMALGAMATION guards around config.h include --- src/lib_json/json_tool.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib_json/json_tool.h b/src/lib_json/json_tool.h index 3a22015b4..6467669d7 100644 --- a/src/lib_json/json_tool.h +++ b/src/lib_json/json_tool.h @@ -6,7 +6,9 @@ #ifndef LIB_JSONCPP_JSON_TOOL_H_INCLUDED #define LIB_JSONCPP_JSON_TOOL_H_INCLUDED +#ifndef JSON_IS_AMALGAMATION #include +#endif // Also support old flag NO_LOCALE_SUPPORT #ifdef NO_LOCALE_SUPPORT