mirror of
https://github.com/termux/termux-packages.git
synced 2024-11-11 13:09:18 +00:00
6770207180
Split patch to per-file patches and enable auto update
30 lines
1009 B
Plaintext
30 lines
1009 B
Plaintext
--- a/src/corelib/thread/qthread_unix.cpp
|
|
+++ b/src/corelib/thread/qthread_unix.cpp
|
|
@@ -63,7 +63,7 @@
|
|
# define SCHED_IDLE 5
|
|
#endif
|
|
|
|
-#if defined(Q_OS_DARWIN) || !defined(Q_OS_ANDROID) && !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0)
|
|
+#if !defined(__ANDROID__) && (defined(Q_OS_DARWIN) || !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0))
|
|
#define QT_HAS_THREAD_PRIORITY_SCHEDULING
|
|
#endif
|
|
|
|
@@ -744,7 +744,7 @@
|
|
|
|
void QThread::terminate()
|
|
{
|
|
-#if !defined(Q_OS_ANDROID)
|
|
+#if !defined(__ANDROID__)
|
|
Q_D(QThread);
|
|
QMutexLocker locker(&d->mutex);
|
|
|
|
@@ -787,7 +787,7 @@
|
|
"Current thread was not started with QThread.");
|
|
|
|
Q_UNUSED(thr);
|
|
-#if defined(Q_OS_ANDROID)
|
|
+#if defined(Q_OS_ANDROID) || defined(__ANDROID__)
|
|
Q_UNUSED(enabled);
|
|
#else
|
|
pthread_setcancelstate(enabled ? PTHREAD_CANCEL_ENABLE : PTHREAD_CANCEL_DISABLE, nullptr);
|