From fe8a34f1515ffad41dac45e90a3b2096cc5699df Mon Sep 17 00:00:00 2001 From: "gtm.daemon" Date: Fri, 20 Nov 2009 20:00:41 +0000 Subject: [Author: thomasvl] Added Xcode configs for iPhone 2.2, 2.2.1, 3.0, 3.1, 3.1.2. Updated the GTMiPhone project to have multiple config support. Updated the helper script to handle all the iPhone configs also. Left the generic configs in for now until the automated builds are updated. Updated one issues with the atomic ops and iphone 3+ sdks. R=dmaclach DELTA=1413 (1397 added, 0 deleted, 16 changed) --- Foundation/GTMObjC2Runtime.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Foundation/GTMObjC2Runtime.h') diff --git a/Foundation/GTMObjC2Runtime.h b/Foundation/GTMObjC2Runtime.h index 9f5afa0..3671381 100644 --- a/Foundation/GTMObjC2Runtime.h +++ b/Foundation/GTMObjC2Runtime.h @@ -91,7 +91,10 @@ GTM_INLINE bool OSAtomicCompareAndSwapPtrBarrier(void *predicate, #endif // MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 #endif // MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 -#if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) || (GTM_IPHONE_DEVICE) +#if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) \ + || (GTM_IPHONE_DEVICE) \ + || (defined(__IPHONE_3_0) \ + && (__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_0)) GTM_INLINE BOOL objc_atomicCompareAndSwapGlobalBarrier(id predicate, id replacement, @@ -107,4 +110,4 @@ GTM_INLINE BOOL objc_atomicCompareAndSwapInstanceVariableBarrier(id predicate, replacement, (void * volatile *)objectLocation); } -#endif // (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) || (GTM_IPHONE_DEVICE) +#endif // (OS_MIN > 10.5) || (GTM_IPHONE_DEVICE) || (IPHONE_MIN > 3.0) -- cgit v1.2.3