diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2013-03-29 00:49:07 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2013-03-29 00:49:07 +0100 |
| commit | 57d4ba8dcca69e26a7897a90a4c01b5922d276b1 (patch) | |
| tree | 47bd045f33336b5228a928a065093bdd81fc5cbb /Source/Core/Common/Src/Thread.cpp | |
| parent | bad4f7f790b6038450488d1c23d8b65329cea4b4 (diff) | |
| parent | 40d919b352a553913f2c1e93e9fa39f2b968b04b (diff) | |
Merge branch 'master' into new-ax-hle
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); |
