diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 10:24:57 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 10:24:57 +0200 |
| commit | e6f5dc2c89eda44fb0a3d444223131a31867a1b2 (patch) | |
| tree | b6bddfe0a0cccef45484314f47967d95a01472bb /cpp/src/IceUtil/Time.cpp | |
| parent | more Java changes & tests (diff) | |
| parent | ICE-4804 - Properties and case-mismatch (diff) | |
| download | ice-e6f5dc2c89eda44fb0a3d444223131a31867a1b2.tar.bz2 ice-e6f5dc2c89eda44fb0a3d444223131a31867a1b2.tar.xz ice-e6f5dc2c89eda44fb0a3d444223131a31867a1b2.zip | |
Merge remote-tracking branch 'origin/master' into encoding11
Conflicts:
cpp/include/Ice/Stream.h
cpp/include/Slice/Preprocessor.h
rb/ruby/Makefile.mak
Diffstat (limited to 'cpp/src/IceUtil/Time.cpp')
| -rw-r--r-- | cpp/src/IceUtil/Time.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp index b830d32412c..bef48d9ab3d 100644 --- a/cpp/src/IceUtil/Time.cpp +++ b/cpp/src/IceUtil/Time.cpp @@ -98,7 +98,7 @@ IceUtil::Time::now(Clock clock) # if defined(_MSC_VER) struct _timeb tb; _ftime(&tb); -# elif defined(__BCPLUSPLUS__) +# elif defined(__MINGW32__) struct timeb tb; ftime(&tb); # endif @@ -131,7 +131,7 @@ IceUtil::Time::now(Clock clock) # if defined(_MSC_VER) struct _timeb tb; _ftime(&tb); -# elif defined(__BCPLUSPLUS__) +# elif defined(__MINGW32__) struct timeb tb; ftime(&tb); # endif |