diff options
| author | Bernard Normier <bernard@zeroc.com> | 2005-09-22 14:01:13 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2005-09-22 14:01:13 +0000 |
| commit | 1fe509c0c26b31ee654dda17be99205362024f68 (patch) | |
| tree | f0248f6827bece2662cc4899071c52b289c6b85a /cpp/src/IceUtil/InputUtil.cpp | |
| parent | Fix (diff) | |
| download | ice-1fe509c0c26b31ee654dda17be99205362024f68.tar.bz2 ice-1fe509c0c26b31ee654dda17be99205362024f68.tar.xz ice-1fe509c0c26b31ee654dda17be99205362024f68.zip | |
Ported IceUtil to VS 2005 Beta 2 x64
Diffstat (limited to 'cpp/src/IceUtil/InputUtil.cpp')
| -rw-r--r-- | cpp/src/IceUtil/InputUtil.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp index 4e0a6f59e88..f554acea2eb 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(_WIN32) +#if defined(ICE_64) + return strtol(s, endptr, base); +#elif 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 |