summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2017-03-12 15:21:57 +0100
committerSlávek Banko <[email protected]>2017-03-12 15:22:21 +0100
commit35fd726141b48726e6076f5d13872fc90af797a5 (patch)
tree247e7655b804d4bfaea1e4989472af8baec79f63
parente76c4b8997852e7f4bbb92ba057a9af463750082 (diff)
downloadtqt3-35fd726141b48726e6076f5d13872fc90af797a5.tar.gz
tqt3-35fd726141b48726e6076f5d13872fc90af797a5.zip
Do not force POSIX mutexes on FreeBSD
This relates to bug 2462 See comments on bug 2744 Signed-off-by: Slávek Banko <[email protected]> (cherry picked from commit 9bbdfea568b8ae52b76aa8366612130403158320)
-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 df7fd7a87..ac466fd88 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))