diff options
| author | Jose <jose@zeroc.com> | 2016-05-25 09:44:48 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-05-25 09:44:48 +0200 |
| commit | 8e5becc229ed4da6164977567671791d378d1cbd (patch) | |
| tree | f9c02ca4c9e2062da894714dc4e4be9d75b86cf0 /cpp/src/IceUtil/Time.cpp | |
| parent | GNU/kFreeBSD specific patches (diff) | |
| download | ice-8e5becc229ed4da6164977567671791d378d1cbd.tar.bz2 ice-8e5becc229ed4da6164977567671791d378d1cbd.tar.xz ice-8e5becc229ed4da6164977567671791d378d1cbd.zip | |
Monotonic clock FreeBSD patches
Diffstat (limited to 'cpp/src/IceUtil/Time.cpp')
| -rw-r--r-- | cpp/src/IceUtil/Time.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp index d792757a9f1..133ba62147d 100644 --- a/cpp/src/IceUtil/Time.cpp +++ b/cpp/src/IceUtil/Time.cpp @@ -63,7 +63,7 @@ InitializeFrequency frequencyInitializer; } #endif -#ifdef __APPLE__ +#if defined(__APPLE__) || defined(__FreeBSD__) namespace { @@ -137,7 +137,7 @@ IceUtil::Time::now(Clock clock) # endif return Time(static_cast<Int64>(tb.time) * ICE_INT64(1000000) + tb.millitm * 1000); } -#elif defined(__hpux) +#elif defined(__hppa) // // HP does not support CLOCK_MONOTONIC // @@ -148,7 +148,7 @@ IceUtil::Time::now(Clock clock) throw SyscallException(__FILE__, __LINE__, errno); } return Time(tv.tv_sec * ICE_INT64(1000000) + tv.tv_usec); -#elif defined(__APPLE__) +#elif defined(__APPLE__) || defined(__FreeBSD__) return Time(mach_absolute_time() * machMultiplier); #else struct timespec ts; |