diff --git a/.gitignore b/.gitignore index f7708b4298..2f3dc5a3ff 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ Debug *.vcxproj.user android/.settings local.properties +.DS_Store diff --git a/thread/prioritizedworkqueue.cpp b/thread/prioritizedworkqueue.cpp index 997f835cfb..746c3fb3c6 100644 --- a/thread/prioritizedworkqueue.cpp +++ b/thread/prioritizedworkqueue.cpp @@ -4,7 +4,7 @@ #include "thread/thread.h" #include "thread/prioritizedworkqueue.h" -#if defined(IOS) || (defined(__APPLE__) && !defined(__MAC_10_7)) +#if defined(IOS) || defined(MACGNUSTD) #include namespace std { using tr1::bind; diff --git a/thread/threadpool.h b/thread/threadpool.h index e89c93e8cd..d7d427cb49 100644 --- a/thread/threadpool.h +++ b/thread/threadpool.h @@ -15,7 +15,7 @@ using namespace std; #endif #include -#if defined(__SYMBIAN32__) || defined(IOS) || (defined(__APPLE__) && !defined(__MAC_10_7)) +#if defined(__SYMBIAN32__) || defined(IOS) || defined(MACGNUSTD) #ifndef __SYMBIAN32__ #include #include