From 23224f1c1da86a8bdcc1128620f01ed624753313 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Mon, 1 Apr 2013 08:02:19 -0700 Subject: [PATCH] OS X: Fix build on Mac OS X 10.6 (from vit9696.) --- Common/ChunkFile.h | 4 ++-- Common/StdMutex.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Common/ChunkFile.h b/Common/ChunkFile.h index 982d854680..1fbf453adf 100644 --- a/Common/ChunkFile.h +++ b/Common/ChunkFile.h @@ -34,7 +34,7 @@ #include #include #ifndef __SYMBIAN32__ -#ifdef IOS +#if defined(IOS) || (defined(__APPLE__) && !defined(__MAC_10_7)) #include #else #include @@ -45,7 +45,7 @@ #include "FileUtil.h" #include "../ext/snappy/snappy-c.h" -#if defined(ANDROID) || defined(IOS) +#if defined(ANDROID) || defined(IOS) || (defined(__APPLE__) && !defined(__MAC_10_7)) namespace std { using tr1::is_pointer; } diff --git a/Common/StdMutex.h b/Common/StdMutex.h index cabebd51ab..2ec9322021 100644 --- a/Common/StdMutex.h +++ b/Common/StdMutex.h @@ -7,7 +7,7 @@ #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) + && !defined(ANDROID) && !defined(__SYMBIAN32__) && !defined(IOS) && !defined(__MAC_10_6) #include #else