From f811d1186395c7d9e75e3b3bcbe960ce46591329 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Thu, 18 Apr 2013 22:52:05 -0500
Subject: [PATCH] Fix clang building the std headers.

---
 Source/Core/Common/Src/StdConditionVariable.h | 2 +-
 Source/Core/Common/Src/StdMutex.h             | 2 +-
 Source/Core/Common/Src/StdThread.h            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/Core/Common/Src/StdConditionVariable.h b/Source/Core/Common/Src/StdConditionVariable.h
index 85875fef10..63f4551950 100644
--- 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
index a20c7f744a..f66a5d1b2e 100644
--- 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
index 19dfd60c37..134bbb2fc0 100644
--- 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