1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QThread/Unix: don't hardcode OSes for PThread cancellation support

Browse Source 
Instead, check the macro that we're about to use. This is also done in
qprocess_unix.cpp

Pick-to: 6.5
Change-Id: I8f3ce163ccc5408cac39fffd178d657b7594d07a
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
(cherry picked from commit dec72d165be9470ef8fa46901260fa1dc32d8568)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Thiago Macieira 2023-10-12 08:23:35 -07:00 committed by Qt Cherry-pick Bot
parent 6e2f311873
commit 19ad876963
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/thread/qthread_unix.cpp
View File

@ -275,7 +275,7 @@ void terminate_on_exception(T &&t)
void *QThreadPrivate::start(void *arg) void *QThreadPrivate::start(void *arg)
{ {
#if !defined(Q_OS_ANDROID) #ifdef PTHREAD_CANCEL_DISABLE
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, nullptr); pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, nullptr);
#endif #endif
pthread_cleanup_push(QThreadPrivate::finish, arg); pthread_cleanup_push(QThreadPrivate::finish, arg);
@ -317,7 +317,7 @@ void *QThreadPrivate::start(void *arg)
#endif #endif
emit thr->started(QThread::QPrivateSignal()); emit thr->started(QThread::QPrivateSignal());
#if !defined(Q_OS_ANDROID) #ifdef PTHREAD_CANCEL_DISABLE
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, nullptr); pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, nullptr);
pthread_testcancel(); pthread_testcancel();
#endif #endif