Commit | Line | Data |
---|---|---|
698b1561 VB |
1 | --- ./qtbase/src/corelib/thread/qthread_unix.cpp 2017-06-28 15:24:29.000000000 +0530 |
2 | +++ ../qthread_unix.cpp 2017-07-19 20:19:40.071681378 +0530 | |
3 | @@ -101,7 +101,7 @@ | |
4 | # define SCHED_IDLE 5 | |
5 | #endif | |
6 | ||
7 | -#if defined(Q_OS_DARWIN) || !defined(Q_OS_ANDROID) && !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0) | |
8 | +#if !defined(__ANDROID__) && (defined(Q_OS_DARWIN) || !defined(Q_OS_OPENBSD) && defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 >= 0)) | |
9 | #define QT_HAS_THREAD_PRIORITY_SCHEDULING | |
10 | #endif | |
11 | ||
12 | @@ -319,7 +319,7 @@ | |
13 | ||
14 | void *QThreadPrivate::start(void *arg) | |
15 | { | |
16 | -#if !defined(Q_OS_ANDROID) | |
17 | +#if !defined(__ANDROID__) | |
18 | pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); | |
19 | #endif | |
20 | pthread_cleanup_push(QThreadPrivate::finish, arg); | |
21 | @@ -369,7 +369,7 @@ | |
22 | #endif | |
23 | ||
24 | emit thr->started(QThread::QPrivateSignal()); | |
25 | -#if !defined(Q_OS_ANDROID) | |
26 | +#if !defined(__ANDROID__) | |
27 | pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); | |
28 | pthread_testcancel(); | |
29 | #endif | |
30 | @@ -666,7 +666,7 @@ | |
31 | ||
32 | void QThread::terminate() | |
33 | { | |
34 | -#if !defined(Q_OS_ANDROID) | |
35 | +#if !defined(__ANDROID__) | |
36 | Q_D(QThread); | |
37 | QMutexLocker locker(&d->mutex); | |
38 | ||
39 | @@ -708,7 +708,7 @@ | |
40 | "Current thread was not started with QThread."); | |
41 | ||
42 | Q_UNUSED(thr) | |
43 | -#if defined(Q_OS_ANDROID) | |
44 | +#if defined(__ANDROID__) | |
45 | Q_UNUSED(enabled); | |
46 | #else | |
47 | pthread_setcancelstate(enabled ? PTHREAD_CANCEL_ENABLE : PTHREAD_CANCEL_DISABLE, NULL); |