diff options
| author | Jose <jose@zeroc.com> | 2012-07-26 17:13:54 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-07-26 17:13:54 +0200 |
| commit | ad088c09c2a5022eb12dbea4523242e05c5d7bdd (patch) | |
| tree | cc69971ee6374439033067c698c5589f978864a7 /cpp/src/IceUtil/Time.cpp | |
| parent | vsadding - fix for update reverse dependencies (diff) | |
| download | ice-ad088c09c2a5022eb12dbea4523242e05c5d7bdd.tar.bz2 ice-ad088c09c2a5022eb12dbea4523242e05c5d7bdd.tar.xz ice-ad088c09c2a5022eb12dbea4523242e05c5d7bdd.zip | |
MinGW & Ruby-1.9 updates
Diffstat (limited to 'cpp/src/IceUtil/Time.cpp')
| -rw-r--r-- | cpp/src/IceUtil/Time.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp index 585335191e8..bef48d9ab3d 100644 --- a/cpp/src/IceUtil/Time.cpp +++ b/cpp/src/IceUtil/Time.cpp @@ -95,8 +95,13 @@ IceUtil::Time::now(Clock clock) if(clock == Realtime) { #ifdef _WIN32 +# if defined(_MSC_VER) struct _timeb tb; _ftime(&tb); +# elif defined(__MINGW32__) + struct timeb tb; + ftime(&tb); +# endif return Time(static_cast<Int64>(tb.time) * ICE_INT64(1000000) + tb.millitm * 1000); #else struct timeval tv; @@ -123,8 +128,13 @@ IceUtil::Time::now(Clock clock) } else { +# if defined(_MSC_VER) struct _timeb tb; _ftime(&tb); +# elif defined(__MINGW32__) + struct timeb tb; + ftime(&tb); +# endif return Time(static_cast<Int64>(tb.time) * ICE_INT64(1000000) + tb.millitm * 1000); } #elif defined(__hpux) |