diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-08-09 14:58:01 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-08-09 14:58:01 +0000 |
| commit | 3f862089b748741b30e343d2051a4747a3bff2f2 (patch) | |
| tree | 18d1dde1504e2d510a24f4d55aeee21bfea7c04f /cpp/src/IceUtil/InputUtil.cpp | |
| parent | fixing bug 1291 (diff) | |
| download | ice-3f862089b748741b30e343d2051a4747a3bff2f2.tar.bz2 ice-3f862089b748741b30e343d2051a4747a3bff2f2.tar.xz ice-3f862089b748741b30e343d2051a4747a3bff2f2.zip | |
Borland C++Builder port mass commit
Diffstat (limited to 'cpp/src/IceUtil/InputUtil.cpp')
| -rw-r--r-- | cpp/src/IceUtil/InputUtil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceUtil/InputUtil.cpp b/cpp/src/IceUtil/InputUtil.cpp index 527f23e166a..620fa5fe68a 100644 --- a/cpp/src/IceUtil/InputUtil.cpp +++ b/cpp/src/IceUtil/InputUtil.cpp @@ -24,7 +24,7 @@ using namespace std; namespace IceUtil { -#if defined(_MSC_VER) && (_MSC_VER < 1300) +#if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) // // The VC60 runtime does not include _strtoi64, so we provide our own implementation // @@ -176,7 +176,7 @@ Int64 strToInt64(const char* s, char** endptr, int base) { #if defined(_WIN32) -# if defined(_MSC_VER) && (_MSC_VER < 1300) +# if defined(__BCPLUSPLUS__) || (defined(_MSC_VER) && (_MSC_VER < 1300)) return strToInt64Impl(s, endptr, base); # else return _strtoi64(s, endptr, base); |