diff options
| author | Jose <pepone@users.noreply.github.com> | 2016-10-12 18:00:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 18:00:46 +0200 |
| commit | 4a30dd488d5816d7bf877a2eac196080abdcccd4 (patch) | |
| tree | bbed1a4db43506fb7afa75bccb7154617a46295e /cpp/src | |
| parent | slice2confluence fixes (diff) | |
| parent | Fix timed conditon on FreeBSD (diff) | |
| download | ice-4a30dd488d5816d7bf877a2eac196080abdcccd4.tar.bz2 ice-4a30dd488d5816d7bf877a2eac196080abdcccd4.tar.xz ice-4a30dd488d5816d7bf877a2eac196080abdcccd4.zip | |
Merge pull request #12 from grembo/patch-2
Fix timed conditon on FreeBSD
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceUtil/Cond.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceUtil/Cond.cpp b/cpp/src/IceUtil/Cond.cpp index 1ec40216661..756ef6db691 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(__hppa) && !defined(__APPLE__) && !defined(__FreeBSD__) +#if !defined(__hppa) && !defined(__APPLE__) rc = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); if(rc != 0) { |