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 #include -#elif __has_include() +#elif __has_include() && !ANDROID // clang and libc++ provide 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 #include -#elif __has_include() +#elif __has_include() && !ANDROID // Clang + libc++ #include #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 -#elif __has_include() +#elif __has_include() && !ANDROID // Clang + libc++ #include #else