From deda1e21772f8efcaf91baab3a9e896c471b0f32 Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Mon, 21 Nov 2005 16:32:10 +0000 Subject: Windows x64 port --- cpp/src/IceUtil/InputUtil.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cpp/src/IceUtil/InputUtil.cpp') 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 -- cgit v1.2.3