changeset 9428:ad24aa13b296

Merge
author dcubed
date Wed, 07 Oct 2015 22:54:08 +0000
parents 4740e6551edf 332b3d89d2bd
children e3053e6726f1
files
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/utilities/globalDefinitions_visCPP.hpp	Wed Oct 07 20:45:15 2015 +0000
+++ b/src/share/vm/utilities/globalDefinitions_visCPP.hpp	Wed Oct 07 22:54:08 2015 +0000
@@ -171,6 +171,12 @@
 #define strdup _strdup
 #endif
 
+// Visual Studio 2013 introduced strtoull(); before, one has to use _strtoui64() instead.
+#if _MSC_VER < 1800
+#define strtoull _strtoui64
+#endif
+
+
 #pragma warning( disable : 4100 ) // unreferenced formal parameter
 #pragma warning( disable : 4127 ) // conditional expression is constant
 #pragma warning( disable : 4514 ) // unreferenced inline function has been removed