Skip to content

Commit 12c67e8

Browse files
committed
Fix amalgamate.py
Fixes open-source-parsers#448.
1 parent c018d9f commit 12c67e8

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

include/json/config.h

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,15 @@
119119
# define JSON_USE_INT64_DOUBLE_CONVERSION 1
120120
#endif
121121

122-
#include "version.h"
122+
#if !defined(JSON_IS_AMALGAMATION)
123123

124-
#if JSONCPP_USING_SECURE_MEMORY
125-
#include "allocator.h" //typedef Allocator
126-
#endif
124+
# include "version.h"
125+
126+
# if JSONCPP_USING_SECURE_MEMORY
127+
# include "allocator.h" //typedef Allocator
128+
# endif
129+
130+
#endif // if !defined(JSON_IS_AMALGAMATION)
127131

128132
namespace Json {
129133
typedef int Int;

0 commit comments

Comments
 (0)