diff options
| author |  gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2012-06-14 14:30:16 +0000 |
|---|---|---|
| committer | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2012-06-14 14:30:16 +0000 |
| commit | cfa3c97b23a26b7eb794aab6bc9d08b1fec0048b (patch) | |
| tree | 641a05bf622534eeede13e19df8e16eac08f7b4d /Foundation | |
| parent | 5f2c40bf66d37dac3547078ecf3a3f0d86848be0 (diff) | |
[Author: thomasvl]
Small fixes for iOS.
R=dmaclach
DELTA=8 (0 added, 2 deleted, 6 changed)
Diffstat (limited to 'Foundation')
| -rw-r--r-- | Foundation/GTMObjC2Runtime.h | 8 | ||||
| -rw-r--r-- | Foundation/GTMObjC2Runtime.m | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/Foundation/GTMObjC2Runtime.h b/Foundation/GTMObjC2Runtime.h index 2ddde67..e4e2ac7 100644 --- a/Foundation/GTMObjC2Runtime.h +++ b/Foundation/GTMObjC2Runtime.h @@ -51,7 +51,7 @@ #import <libkern/OSAtomic.h> -#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 +#if GTM_MACOS_SDK && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) #import "objc/Protocol.h" OBJC_EXPORT Class object_getClass(id obj); @@ -92,9 +92,9 @@ 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 +#endif // GTM_MACOS_SDK && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) -#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 +#if GTM_MACOS_SDK && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5) GTM_INLINE BOOL objc_atomicCompareAndSwapGlobalBarrier(id predicate, id replacement, @@ -110,4 +110,4 @@ GTM_INLINE BOOL objc_atomicCompareAndSwapInstanceVariableBarrier(id predicate, replacement, (void * volatile *)objectLocation); } -#endif // MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5 +#endif // GTM_MACOS_SDK && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5) diff --git a/Foundation/GTMObjC2Runtime.m b/Foundation/GTMObjC2Runtime.m index 0b4614c..f284542 100644 --- a/Foundation/GTMObjC2Runtime.m +++ b/Foundation/GTMObjC2Runtime.m @@ -18,7 +18,7 @@ #import "GTMObjC2Runtime.h" -#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 +#if GTM_MACOS_SDK && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) #import <stdlib.h> #import <string.h> @@ -160,6 +160,4 @@ BOOL sel_isEqual(SEL lhs, SEL rhs) { return (lhs == rhs) ? YES : NO; } -#endif - - +#endif // GTM_MACOS_SDK && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) |