From 12c67e810d1e6b86f7297ae6b736eef229b482ce Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Mon, 21 Mar 2016 20:33:15 -0500 Subject: [PATCH] Fix amalgamate.py Fixes #448. --- include/json/config.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/json/config.h b/include/json/config.h index 1e96210..7ceb074 100644 --- a/include/json/config.h +++ b/include/json/config.h @@ -119,11 +119,15 @@ # define JSON_USE_INT64_DOUBLE_CONVERSION 1 #endif -#include "version.h" +#if !defined(JSON_IS_AMALGAMATION) -#if JSONCPP_USING_SECURE_MEMORY -#include "allocator.h" //typedef Allocator -#endif +# include "version.h" + +# if JSONCPP_USING_SECURE_MEMORY +# include "allocator.h" //typedef Allocator +# endif + +#endif // if !defined(JSON_IS_AMALGAMATION) namespace Json { typedef int Int;