diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceUtil/Makefile | 2 | ||||
| -rw-r--r-- | cpp/src/IceUtil/MutexProtocol.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/IceUtil/Makefile b/cpp/src/IceUtil/Makefile index 099c45e8e2c..875415f9b97 100644 --- a/cpp/src/IceUtil/Makefile +++ b/cpp/src/IceUtil/Makefile @@ -43,7 +43,7 @@ SRCS = $(OBJS:.o=.cpp) include $(top_srcdir)/config/Make.rules -CPPFLAGS := $(CPPFLAGS) -DICE_UTIL_API_EXPORTS -I.. +CPPFLAGS := $(CPPFLAGS) $(ICEUTIL_FLAGS) -DICE_UTIL_API_EXPORTS -I.. LINKWITH := $(STLPORT_LIBS) $(ICEUTIL_OS_LIBS) diff --git a/cpp/src/IceUtil/MutexProtocol.cpp b/cpp/src/IceUtil/MutexProtocol.cpp index d181c0160ab..ab50c8cc420 100644 --- a/cpp/src/IceUtil/MutexProtocol.cpp +++ b/cpp/src/IceUtil/MutexProtocol.cpp @@ -7,6 +7,10 @@ IceUtil::getDefaultMutexProtocol() #ifdef _WIN32 return PrioNone; #else - return ICE_DEFAULT_MUTEX_PROTOCOL; +# if defined(PRIO_INHERIT) && defined(_POSIX_THREAD_PRIO_INHERIT) && _POSIX_THREAD_PRIO_INHERIT > 0 + return PrioInherit; +# else + return PrioNone; +# endif #endif } |