Merge pull request open-source-parsers#788 from pavel-pimenov/fix-782

cdunn2001 · web-flow · commit d31a5300e172 · 2018-06-22T10:29:52.000-05:00
Fix open-source-parsers#782
diff --git 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
 
+#if !defined(JSON_IS_AMALGAMATION)
 #include <json/config.h>
+#endif
 
 // Also support old flag NO_LOCALE_SUPPORT
 #ifdef NO_LOCALE_SUPPORT
