diff --git a/Common/ChunkFile.h b/Common/ChunkFile.h index b9ae0be8ae..095831678a 100644 --- a/Common/ChunkFile.h +++ b/Common/ChunkFile.h @@ -41,7 +41,7 @@ #include "FileUtil.h" #include "../ext/snappy/snappy-c.h" -#ifdef ANDROID +#if defined(ANDROID) || defined(IOS) namespace std { using tr1::is_pointer; } diff --git a/Common/StdMutex.h b/Common/StdMutex.h index e143f9bc95..cabebd51ab 100644 --- a/Common/StdMutex.h +++ b/Common/StdMutex.h @@ -5,24 +5,20 @@ #define GCC_VER(x,y,z) ((x) * 10000 + (y) * 100 + (z)) #define GCC_VERSION GCC_VER(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) -#if GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ && !defined(ANDROID) && !defined(__SYMBIAN32__) || defined(__APPLE__) -// GCC 4.4 provides +#if (GCC_VERSION >= GCC_VER(4,4,0) && __GXX_EXPERIMENTAL_CXX0X__ || defined(__APPLE__)) \ +/* GCC 4.4 provides , except on these platforms: */ \ + && !defined(ANDROID) && !defined(__SYMBIAN32__) && !defined(IOS) #include #else // partial implementation for win32/pthread - #include -#if defined(_WIN32) -// WIN32 +#if defined(_WIN32) // WIN32 #define WIN32_LEAN_AND_MEAN #include - -#else -// POSIX +#else // POSIX #include - #endif #if (_MSC_VER >= 1600) || (GCC_VERSION >= GCC_VER(4,3,0) && __GXX_EXPERIMENTAL_CXX0X__)