From 91f6460aff0a6ab5142f16d5f4fc1f559ca1c325 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 25 Apr 2016 19:05:33 -0700 Subject: Implement futexes for Windows Windows 8 added this pair of functions that can be used to implement the same functionality as we have on Linux. For ease of understanding, I'm calling them "futex" on Windows too. From Qt 6 our minimum platform is Windows 10 so we can use this unconditionally. Change-Id: Ifea6e497f11a461db432ffff1448c6806ecfc36c Reviewed-by: Qt CI Bot Reviewed-by: Fabian Kosmale --- src/corelib/thread/qmutex_p.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/corelib/thread/qmutex_p.h') diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h index 96a979e66b..b7d0bdab9b 100644 --- a/src/corelib/thread/qmutex_p.h +++ b/src/corelib/thread/qmutex_p.h @@ -62,9 +62,6 @@ #if defined(Q_OS_MAC) # include -#elif defined(Q_OS_LINUX) && !defined(QT_LINUXBASE) -// use Linux mutexes everywhere except for LSB builds -# define QT_LINUX_FUTEX #elif defined(Q_OS_UNIX) # if _POSIX_VERSION-0 >= 200112L || _XOPEN_VERSION-0 >= 600 # include @@ -76,7 +73,6 @@ struct timespec; QT_BEGIN_NAMESPACE -#if !defined(QT_LINUX_FUTEX) class QMutexPrivate { public: @@ -134,7 +130,6 @@ public: Qt::HANDLE event; #endif }; -#endif //QT_LINUX_FUTEX #ifdef Q_OS_UNIX -- cgit v1.2.3