Merge pull request #559 from corporateshark/master

Custom Microsoft headers are necessary only for Visual Studio 2012 and lower
Tencent · Feb 26, 2016 · 4de9ba5 · 4de9ba5
2 parents ed7efe6 + 852ed80
commit 4de9ba5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/include/rapidjson/rapidjson.h b/include/rapidjson/rapidjson.h
@@ -159,7 +159,7 @@
 */
 #ifndef RAPIDJSON_NO_INT64DEFINE
 //!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && (_MSC_VER < 1800)	// Visual Studio 2013
 #include "msinttypes/stdint.h"
 #include "msinttypes/inttypes.h"
 #else