# HG changeset patch
# User dcubed
# Date 1444258448 0
# Node ID 0027c6eaf1a99fe7ebd31d2f139cd6c88991cd83
# Parent  d4b9337eafcb9f2a1fbd684839903422d10adb3a# Parent  b32f4ad404095811e9403ff724d9be811e260592
Merge

diff -r d4b9337eafcb -r 0027c6eaf1a9 hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp
--- a/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp	Wed Oct 07 20:45:15 2015 +0000
+++ b/hotspot/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