summaryrefslogtreecommitdiff
path: root/cpp/src/IceUtil
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-05-26 18:36:47 +0200
committerJose <jose@zeroc.com>2016-05-26 18:36:47 +0200
commit5a342be6df4370f047268db349c08a2521f484c8 (patch)
tree93997d7b368709a26b10a5355b101eb41e19865e /cpp/src/IceUtil
parentJava build fixes to better support Debian packaging: (diff)
downloadice-5a342be6df4370f047268db349c08a2521f484c8.tar.bz2
ice-5a342be6df4370f047268db349c08a2521f484c8.tar.xz
ice-5a342be6df4370f047268db349c08a2521f484c8.zip
FreeBSD patches
Diffstat (limited to 'cpp/src/IceUtil')
-rw-r--r--cpp/src/IceUtil/Time.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp
index 133ba62147d..88073886137 100644
--- a/cpp/src/IceUtil/Time.cpp
+++ b/cpp/src/IceUtil/Time.cpp
@@ -63,7 +63,7 @@ InitializeFrequency frequencyInitializer;
}
#endif
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__APPLE__)
namespace
{
@@ -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__) || defined(__FreeBSD__)
+#elif defined(__APPLE__)
return Time(mach_absolute_time() * machMultiplier);
#else
struct timespec ts;