[Android] Android NDK now supports full implementations of std::mutex…

…, std::thread, and std::conditional_variable so there is no need to have our own implementations there now.
dolphin-emu · Aug 30, 2013 · 8bb16d8 · 8bb16d8
1 parent 0df6477
commit 8bb16d8
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
@@ -9,7 +9,7 @@
 #define __has_include(s) 0
 #endif
 
-#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID
+#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ 
 
 // GCC 4.4 provides <condition_variable>
 #include <condition_variable>

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

diff --git a/Source/Core/Common/Src/StdThread.h b/Source/Core/Common/Src/StdThread.h
@@ -9,7 +9,7 @@
 #define __has_include(s) 0
 #endif
 
-#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !ANDROID
+#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__
 // GCC 4.4 provides <thread>
 #ifndef _GLIBCXX_USE_SCHED_YIELD
 #define _GLIBCXX_USE_SCHED_YIELD