summaryrefslogtreecommitdiff
path: root/cpp/src/IceUtil
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceUtil')
-rw-r--r--cpp/src/IceUtil/Cond.cpp2
-rw-r--r--cpp/src/IceUtil/Time.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceUtil/Cond.cpp b/cpp/src/IceUtil/Cond.cpp
index b833036e87b..1ec40216661 100644
--- a/cpp/src/IceUtil/Cond.cpp
+++ b/cpp/src/IceUtil/Cond.cpp
@@ -332,7 +332,7 @@ IceUtil::Cond::Cond()
throw ThreadSyscallException(__FILE__, __LINE__, rc);
}
-#if !defined(__hpux) && !defined(__APPLE__)
+#if !defined(__hppa) && !defined(__APPLE__) && !defined(__FreeBSD__)
rc = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);
if(rc != 0)
{
diff --git a/cpp/src/IceUtil/Time.cpp b/cpp/src/IceUtil/Time.cpp
index a771815ddb6..1dbf23e1d72 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__)
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
//