commit 12c67e810d1e6b86f7297ae6b736eef229b482ce
author Christopher Dunn <cdunn2001@gmail.com> Mon Mar 21 20:33:15 2016 -0500
committer Christopher Dunn <cdunn2001@gmail.com> Mon Mar 21 20:33:34 2016 -0500
tree 2701f45e92aa82c0072d81ced117e63234e4fc28
parent c018d9fc3a7fa54c53882f2efe420cb9b21cd658

Fix amalgamate.py

Fixes #448.

include/json/config.h

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;