diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2012-02-21 11:08:39 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-21 13:52:52 +0100 |
| commit | c69106d1bf66d64e046c4f639542457151187dfc (patch) | |
| tree | e050b62e84a8f96dc68023e41ccba03cbdf7981e /src/corelib/thread/qmutex.cpp | |
| parent | 4fad7ae76a0ea834a35737e9b79c3ac3818a8713 (diff) | |
Rename Q_MUTEX_LINUX to QT_LINUX_FUTEX
As requested by Thiago
Change-Id: Ie5b00cf4e530e19d360d0bc588f0f051e04b338f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/thread/qmutex.cpp')
| -rw-r--r-- | src/corelib/thread/qmutex.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp index e13c78636c0..049230f7a42 100644 --- a/src/corelib/thread/qmutex.cpp +++ b/src/corelib/thread/qmutex.cpp @@ -49,7 +49,7 @@ #include "qthread.h" #include "qmutex_p.h" -#ifndef Q_MUTEX_LINUX +#ifndef QT_LINUX_FUTEX #include "private/qfreelist_p.h" #endif @@ -154,7 +154,7 @@ QMutex::~QMutex() if (quintptr(d) > 0x3 && d->recursive) { delete static_cast<QRecursiveMutexPrivate *>(d); } else if (d) { -#ifndef Q_MUTEX_LINUX +#ifndef QT_LINUX_FUTEX if (d != dummyLocked() && static_cast<QMutexPrivate *>(d)->possiblyUnlocked.load() && tryLock()) { unlock(); @@ -340,7 +340,7 @@ bool QBasicMutex::isRecursive() { \sa unlock() */ -#ifndef Q_MUTEX_LINUX //linux implementation is in qmutex_linux.cpp +#ifndef QT_LINUX_FUTEX //linux implementation is in qmutex_linux.cpp /*! \internal helper for lock() */ |