Fix clang building the std headers.

dolphin-emu · Apr 19, 2013 · f811d11 · f811d11
1 parent d68955c
commit f811d11
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Source/Core/Common/Src/StdConditionVariable.h b/Source/Core/Common/Src/StdConditionVariable.h
@@ -14,7 +14,7 @@
 // GCC 4.4 provides <condition_variable>
 #include <condition_variable>
 
-#elif __has_include(<condition_variable>)
+#elif __has_include(<condition_variable>) && !ANDROID
 
 // clang and libc++ provide <condition_variable> on OSX. However, the version
 // of libc++ bundled with OSX 10.7 and 10.8 is buggy: it uses _ as a variable.

diff --git a/Source/Core/Common/Src/StdMutex.h b/Source/Core/Common/Src/StdMutex.h
@@ -12,7 +12,7 @@
 #if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID
 // GCC 4.4 provides <mutex>
 #include <mutex>
-#elif __has_include(<mutex>)
+#elif __has_include(<mutex>) && !ANDROID
 // Clang + libc++
 #include <mutex>
 #else

diff --git a/Source/Core/Common/Src/StdThread.h b/Source/Core/Common/Src/StdThread.h
@@ -15,7 +15,7 @@
 #define _GLIBCXX_USE_SCHED_YIELD
 #endif
 #include <thread>
-#elif __has_include(<thread>)
+#elif __has_include(<thread>) && !ANDROID
 // Clang + libc++
 #include <thread>
 #else