diff options
| author | Jose <jose@zeroc.com> | 2016-10-13 14:46:59 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-10-13 14:46:59 +0200 |
| commit | a9940e76262e0301c0291367960d553764698665 (patch) | |
| tree | b15342eeba62cef0ef8866ba8cd49f595d83c8c6 /cpp/src/Ice/Cond.cpp | |
| parent | Changed parsing of hex escape sequences in Slice string literals (diff) | |
| parent | Merge pull request #12 from grembo/patch-2 (diff) | |
| download | ice-a9940e76262e0301c0291367960d553764698665.tar.bz2 ice-a9940e76262e0301c0291367960d553764698665.tar.xz ice-a9940e76262e0301c0291367960d553764698665.zip | |
Merge remote-tracking branch 'origin/3.6'
Conflicts:
cpp/src/slice2confluence/Makefile
cpp/src/slice2confluence/Makefile.mak
Diffstat (limited to 'cpp/src/Ice/Cond.cpp')
| -rw-r--r-- | cpp/src/Ice/Cond.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Cond.cpp b/cpp/src/Ice/Cond.cpp index 1ec40216661..756ef6db691 100644 --- a/cpp/src/Ice/Cond.cpp +++ b/cpp/src/Ice/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) { |