diff options
| author | Jose <jose@zeroc.com> | 2012-04-03 14:02:03 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-04-03 14:02:03 +0200 |
| commit | 9a4262d4e6a7b2044dfc01c2d9afca357c05cf3d (patch) | |
| tree | 32b853bdfe53e2e0e20723025adf07502480cb8e /cpp | |
| parent | ICE-4815 - .NET SessionFactoryHelper NullReferenceException when initData.pro... (diff) | |
| download | ice-9a4262d4e6a7b2044dfc01c2d9afca357c05cf3d.tar.bz2 ice-9a4262d4e6a7b2044dfc01c2d9afca357c05cf3d.tar.xz ice-9a4262d4e6a7b2044dfc01c2d9afca357c05cf3d.zip | |
Rename define PRIO_INHERIT > ICE_PRIO_INHERIT
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules | 2 | ||||
| -rw-r--r-- | cpp/src/IceUtil/MutexProtocol.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 9d191cec0df..99052af31f3 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -185,7 +185,7 @@ else endif ifeq ($(DEFAULT_MUTEX_PROTOCOL), PrioInherit) - ICEUTIL_FLAGS = -DPRIO_INHERIT + ICEUTIL_FLAGS = -DICE_PRIO_INHERIT endif OPENSSL_FLAGS = $(if $(OPENSSL_HOME),-I$(OPENSSL_HOME)/include) diff --git a/cpp/src/IceUtil/MutexProtocol.cpp b/cpp/src/IceUtil/MutexProtocol.cpp index ab50c8cc420..a0c7138ee50 100644 --- a/cpp/src/IceUtil/MutexProtocol.cpp +++ b/cpp/src/IceUtil/MutexProtocol.cpp @@ -7,7 +7,7 @@ IceUtil::getDefaultMutexProtocol() #ifdef _WIN32 return PrioNone; #else -# if defined(PRIO_INHERIT) && defined(_POSIX_THREAD_PRIO_INHERIT) && _POSIX_THREAD_PRIO_INHERIT > 0 +# if defined(ICE_PRIO_INHERIT) && defined(_POSIX_THREAD_PRIO_INHERIT) && _POSIX_THREAD_PRIO_INHERIT > 0 return PrioInherit; # else return PrioNone; |