diff options
| author | Jose <jose@zeroc.com> | 2012-08-08 18:52:08 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-08 18:52:08 +0200 |
| commit | 0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545 (patch) | |
| tree | 8067c6695cc5e9672582a904409846e38ffba593 /cpp/src/IceUtil/InputUtil.cpp | |
| parent | Fixed python & ruby compilation error caused by OutputStream::format removal (diff) | |
| download | ice-0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545.tar.bz2 ice-0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545.tar.xz ice-0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545.zip | |
remove VC6 support
Diffstat (limited to 'cpp/src/IceUtil/InputUtil.cpp')
| -rw-r--r-- | cpp/src/IceUtil/InputUtil.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp index 8f5edab81f9..058331a0552 100644 --- a/cpp/src/IceUtil/InputUtil.cpp +++ b/cpp/src/IceUtil/InputUtil.cpp @@ -11,7 +11,7 @@ #include <stdlib.h> #include <errno.h> -#if (defined(_MSC_VER) && (_MSC_VER < 1300) ) || (__MINGW32__) +#ifdef __MINGW32__ #include <limits.h> #endif @@ -26,10 +26,10 @@ namespace IceUtilInternal { -#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) +#ifdef __MINGW32__ // -// The VC60 runtime does not include _strtoi64, so we provide our own implementation +// The MINGW runtime does not include _strtoi64, so we provide our own implementation // static const string allDigits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; @@ -179,7 +179,7 @@ Int64 strToInt64(const char* s, char** endptr, int base) { #if defined(_WIN32) -# if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) +# ifdef __MINGW32__ return strToInt64Impl(s, endptr, base); # else return _strtoi64(s, endptr, base); |