diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-01-26 11:35:11 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2018-01-26 11:35:11 -0500 |
| commit | bf1057ad57b46bda03ebc5c7ce58358d94e448fc (patch) | |
| tree | 4989eed226e0ecaf88607a6fef9c1d403d6c56c8 | |
| parent | Fixed macOS bug where Ice/objects client would crash on macOS when ran agains... (diff) | |
| download | ice-bf1057ad57b46bda03ebc5c7ce58358d94e448fc.tar.bz2 ice-bf1057ad57b46bda03ebc5c7ce58358d94e448fc.tar.xz ice-bf1057ad57b46bda03ebc5c7ce58358d94e448fc.zip | |
Removed __USE_UNIX98 check (ICE-8580)
| -rw-r--r-- | cpp/include/IceUtil/Mutex.h | 5 | ||||
| -rw-r--r-- | cpp/src/IceUtil/RecMutex.cpp | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h index 31c6eb99d1b..22c7561be1a 100644 --- a/cpp/include/IceUtil/Mutex.h +++ b/cpp/include/IceUtil/Mutex.h @@ -1,3 +1,4 @@ + // ********************************************************************** // // Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. @@ -237,11 +238,7 @@ Mutex::init(MutexProtocol // Enable mutex error checking in debug builds // #ifndef NDEBUG -#if defined(__linux) && !defined(__USE_UNIX98) - rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP); -#else rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); -#endif assert(rc == 0); if(rc != 0) { diff --git a/cpp/src/IceUtil/RecMutex.cpp b/cpp/src/IceUtil/RecMutex.cpp index cf47bd519e7..b6f0086ce67 100644 --- a/cpp/src/IceUtil/RecMutex.cpp +++ b/cpp/src/IceUtil/RecMutex.cpp @@ -125,11 +125,7 @@ IceUtil::RecMutex::init(const MutexProtocol protocol) throw ThreadSyscallException(__FILE__, __LINE__, rc); } -#if defined(__linux) && !defined(__USE_UNIX98) - rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); -#else rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); -#endif assert(rc == 0); if(rc != 0) { |