3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-27 11:21:02 +08:00
Code Issues Projects Releases Wiki Activity

Fix amalgamate.py

Browse Source 
Fixes #448.
This commit is contained in:
Christopher Dunn 2016-03-21 20:33:15 -05:00
parent c018d9fc3a
commit 12c67e810d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/json/config.h
View File

@ -119,11 +119,15 @@
# define JSON_USE_INT64_DOUBLE_CONVERSION 1 # define JSON_USE_INT64_DOUBLE_CONVERSION 1
#endif #endif
#include "version.h" #if !defined(JSON_IS_AMALGAMATION)
#if JSONCPP_USING_SECURE_MEMORY # include "version.h"
#include "allocator.h" //typedef Allocator
#endif # if JSONCPP_USING_SECURE_MEMORY
# include "allocator.h" //typedef Allocator
# endif
#endif // if !defined(JSON_IS_AMALGAMATION)
namespace Json { namespace Json {
typedef int Int; typedef int Int;