piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix clang building the std headers.

Browse Source
This commit is contained in:
Ryan Houdek
2013-04-18 22:52:05 -05:00
parent d68955c539
commit f811d11863
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Src/StdConditionVariable.h
View File

@ -14,7 +14,7 @@
// GCC 4.4 provides <condition_variable> // GCC 4.4 provides <condition_variable>
#include <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 // 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. // of libc++ bundled with OSX 10.7 and 10.8 is buggy: it uses _ as a variable.

2
Source/Core/Common/Src/StdMutex.h
View File

@ -12,7 +12,7 @@
#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID #if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID
// GCC 4.4 provides <mutex> // GCC 4.4 provides <mutex>
#include <mutex> #include <mutex>
#elif __has_include(<mutex>) #elif __has_include(<mutex>) && !ANDROID
// Clang + libc++ // Clang + libc++
#include <mutex> #include <mutex>
#else #else

2
Source/Core/Common/Src/StdThread.h
View File

@ -15,7 +15,7 @@
#define _GLIBCXX_USE_SCHED_YIELD #define _GLIBCXX_USE_SCHED_YIELD
#endif #endif
#include <thread> #include <thread>
#elif __has_include(<thread>) #elif __has_include(<thread>) && !ANDROID
// Clang + libc++ // Clang + libc++
#include <thread> #include <thread>
#else #else