diff options
| author | Ryan Houdek <Sonicadvance1@Gmail.com> | 2013-02-27 02:22:08 +0000 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@Gmail.com> | 2013-02-27 02:22:08 +0000 |
| commit | 692e39d1bbe14f0c84e1d0e98e578534d1f1d656 (patch) | |
| tree | 1dfec903910553e323f6b04b510c315fc8a3caed /Source/Core/Common/Src/Thread.cpp | |
| parent | a680d17eef88646b8cd6018c1c5e8f0e39d056ee (diff) | |
| parent | be7643cd2d1a27324070550ad82eca2c3bd59f19 (diff) | |
Merge branch 'arm-noglsl'
Diffstat (limited to 'Source/Core/Common/Src/Thread.cpp')
| -rw-r--r-- | Source/Core/Common/Src/Thread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Common/Src/Thread.cpp b/Source/Core/Common/Src/Thread.cpp index 73f83c204f..3e8440b74f 100644 --- a/Source/Core/Common/Src/Thread.cpp +++ b/Source/Core/Common/Src/Thread.cpp @@ -105,7 +105,7 @@ void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask) #ifdef __APPLE__ thread_policy_set(pthread_mach_thread_np(thread), THREAD_AFFINITY_POLICY, (integer_t *)&mask, 1); -#elif defined __linux__ || defined BSD4_4 +#elif (defined __linux__ || defined BSD4_4) && !(defined ANDROID) cpu_set_t cpu_set; CPU_ZERO(&cpu_set); |
