diff options
| author | grembo <freebsd@grem.de> | 2016-10-12 01:01:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 01:01:10 +0200 |
| commit | 9659d3748031a0e7a3e82a64ac5bbbe820997145 (patch) | |
| tree | bbed1a4db43506fb7afa75bccb7154617a46295e /cpp/src | |
| parent | slice2confluence fixes (diff) | |
| download | ice-9659d3748031a0e7a3e82a64ac5bbbe820997145.tar.bz2 ice-9659d3748031a0e7a3e82a64ac5bbbe820997145.tar.xz ice-9659d3748031a0e7a3e82a64ac5bbbe820997145.zip | |
Fix timed conditon on FreeBSD
As part of 8e5becc229ed4da6164977567671791d378d1cbd this condition sneaked into the code. Since the other part of the change in Time.cpp wasn't merged into 3.6.3 (doesn't build), this was probably forgotten, effectively breaking timed conditions on FreeBSD (caught by unit test IceUtil/timer).
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) { |