summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-03-12 15:20:58 +0100
committerSlávek Banko <slavek.banko@axis.cz>2017-03-12 15:21:27 +0100
commit47690cd1412fc3cb21cf3d2b82e9f8bddebc99a7 (patch)
tree94b460c6236b2ee7f0c3bb62968c04ddf511e87f
parent81d4481aded9890f39da862be1b594c04ac01279 (diff)
downloadqt3-47690cd1412fc3cb21cf3d2b82e9f8bddebc99a7.tar.gz
qt3-47690cd1412fc3cb21cf3d2b82e9f8bddebc99a7.zip
Do not force POSIX mutexes on FreeBSD
This relates to bug 2462 See comments on bug 2744 Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit e70f5ecf7693b63d3221c590ae05414307515451)
-rw-r--r--src/tools/qmutex_unix.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/qmutex_unix.cpp b/src/tools/qmutex_unix.cpp
index 6934253..fde558f 100644
--- a/src/tools/qmutex_unix.cpp
+++ b/src/tools/qmutex_unix.cpp
@@ -45,8 +45,8 @@
typedef pthread_mutex_t Q_MUTEX_T;
// POSIX threads mutex types
-#if ((defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) || \
- defined(Q_OS_FREEBSD)) && !defined(Q_OS_UNIXWARE) && !defined(Q_OS_SOLARIS) && \
+#if (defined(PTHREAD_MUTEX_RECURSIVE) && defined(PTHREAD_MUTEX_DEFAULT)) && \
+ !defined(Q_OS_UNIXWARE) && !defined(Q_OS_SOLARIS) && \
!defined(Q_OS_MAC)
// POSIX 1003.1c-1995 - We love this OS
# define Q_MUTEX_SET_TYPE(a, b) pthread_mutexattr_settype((a), (b))