From 97f5b1665fa495a494eb2ad40034ececfac853d9 Mon Sep 17 00:00:00 2001 From: rog Date: Mon, 26 Nov 2012 01:41:00 -0500 Subject: what is this even... --- Source/Core/Common/Src/Thread.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'Source/Core/Common/Src/Thread.cpp') diff --git a/Source/Core/Common/Src/Thread.cpp b/Source/Core/Common/Src/Thread.cpp index ce91aac651..73f83c204f 100644 --- a/Source/Core/Common/Src/Thread.cpp +++ b/Source/Core/Common/Src/Thread.cpp @@ -15,7 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "Setup.h" #include "Thread.h" #include "Common.h" -- cgit v1.2.3 From 717b9768750dfef39120d4457a832ce7558bd879 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 26 Feb 2013 13:49:00 -0600 Subject: ARM Support without GLSL --- Source/Core/Common/Src/Thread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/Common/Src/Thread.cpp') 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); -- cgit v1.2.3