Merge pull request #703 from jmallach/master

Fix builds on x32 platform.

Merge pull request #703 from jmallach/master
Fix builds on x32 platform.
ab791ae9 · Milo Yip · GitHub · fedae855 · 323a0dce · ab791ae9
Commit ab791ae9 authored Aug 02, 2016 by Milo Yip Committed by GitHub Aug 02, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

rapidjson.h include/rapidjson/rapidjson.h +1 -1

No files found.
--- a/include/rapidjson/rapidjson.h
+++ b/include/rapidjson/rapidjson.h
@@ -250,7 +250,7 @@

 //! Whether using 64-bit architecture
 #ifndef RAPIDJSON_64BIT
-#if defined(__LP64__) || defined(_WIN64) || defined(__EMSCRIPTEN__)
+#if defined(__LP64__) || (defined(__x86_64__) && defined(__ILP32__)) || defined(_WIN64) || defined(__EMSCRIPTEN__)
 #define RAPIDJSON_64BIT 1
 #else
 #define RAPIDJSON_64BIT 0