summaryrefslogtreecommitdiff
path: root/cpp/src/IceUtil/InputUtil.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceUtil/InputUtil.cpp')
-rw-r--r--cpp/src/IceUtil/InputUtil.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp
index f554acea2eb..4e0a6f59e88 100644
--- a/cpp/src/IceUtil/InputUtil.cpp
+++ b/cpp/src/IceUtil/InputUtil.cpp
@@ -175,14 +175,14 @@ strToInt64Impl(const char* s, char** endptr, int base)
Int64
strToInt64(const char* s, char** endptr, int base)
{
-#if defined(ICE_64)
- return strtol(s, endptr, base);
-#elif defined(_WIN32)
+#if defined(_WIN32)
# if defined(_MSC_VER) && (_MSC_VER < 1300)
return strToInt64Impl(s, endptr, base);
# else
return _strtoi64(s, endptr, base);
# endif
+#elif defined(ICE_64)
+ return strtol(s, endptr, base);
#elif defined(__hpux)
return __strtoll(s, endptr, base);
#else