diff options
| author |  gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2009-04-29 05:15:14 +0000 |
|---|---|---|
| committer | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2009-04-29 05:15:14 +0000 |
| commit | 8a7c2a4fe71be92a6d1a76b942755a2dc7a901f3 (patch) | |
| tree | 323aa1bd7e5a47cad05c1a6e64921874af8acb26 /GTMDefines.h | |
| parent | 421ee4856f637c33ba45c1cae4a21658717031cf (diff) | |
[Author: dmaclach]
Fixes up GTMDefines so that it can be parsed by headerdoc.
OCL=10963680
TBR=thomasvl
CC=gtm-eng
Diffstat (limited to 'GTMDefines.h')
| -rw-r--r-- | GTMDefines.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/GTMDefines.h b/GTMDefines.h index b88193c..846e56c 100644 --- a/GTMDefines.h +++ b/GTMDefines.h @@ -29,6 +29,21 @@ #define MAC_OS_X_VERSION_10_6 1060 #endif +// These definitions exist to allow headerdoc to parse this file. +// Headerdoc 8.6 gives warnings about misuses of MAC_OS_X_VERSION_MIN_REQUIRED +// and MAC_OS_X_VERSION_MAX_ALLOWED if you use them directly. +// By defining GTM versions with slightly different names (MIN vs MINIMUM) +// we get around headerdoc's issues. Hopefully we can work around this in the +// future and get rid of the GTM versions, so please use the default ones +// wherever you can. +#ifndef GTM_MAC_OS_X_VERSION_MINIMUM_REQUIRED + #define GTM_MAC_OS_X_VERSION_MINIMUM_REQUIRED MAC_OS_X_VERSION_MIN_REQUIRED +#endif + +#ifndef GTM_MAC_OS_X_VERSION_MAXIMUM_ALLOWED + #define GTM_MAC_OS_X_VERSION_MAXIMUM_ALLOWED MAC_OS_X_VERSION_MAX_ALLOWED +#endif + // ---------------------------------------------------------------------------- // CPP symbols that can be overridden in a prefix to control how the toolbox // is compiled. @@ -150,7 +165,7 @@ GTM_EXTERN void _GTMUnitTestDevLog(NSString *format, ...); // does keys, so pick the right thing, nothing is done on the FastEnumeration // side to be sure you're getting what you wanted. #ifndef GTM_FOREACH_OBJECT - #if TARGET_OS_IPHONE || (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) + #if TARGET_OS_IPHONE || (GTM_MAC_OS_X_VERSION_MINIMUM_REQUIRED >= MAC_OS_X_VERSION_10_5) #define GTM_FOREACH_OBJECT(element, collection) \ for (element in collection) #define GTM_FOREACH_KEY(element, collection) \ @@ -197,7 +212,7 @@ GTM_EXTERN void _GTMUnitTestDevLog(NSString *format, ...); #else // We can't find a symbol to tell if GC is supported/required, so best we // do on Mac targets is include it if we're on 10.5 or later. - #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 + #if GTM_MAC_OS_X_VERSION_MAXIMUM_ALLOWED <= MAC_OS_X_VERSION_10_4 #define GTM_SUPPORT_GC 0 #else #define GTM_SUPPORT_GC 1 @@ -207,7 +222,7 @@ GTM_EXTERN void _GTMUnitTestDevLog(NSString *format, ...); // To simplify support for 64bit (and Leopard in general), we provide the type // defines for non Leopard SDKs -#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 +#if GTM_MAC_OS_X_VERSION_MAXIMUM_ALLOWED <= MAC_OS_X_VERSION_10_4 // NSInteger/NSUInteger and Max/Mins #ifndef NSINTEGER_DEFINED #if __LP64__ || NS_BUILD_32_LIKE_64 @@ -238,4 +253,4 @@ GTM_EXTERN void _GTMUnitTestDevLog(NSString *format, ...); #endif /* !defined(__LP64__) || !__LP64__ */ #define CGFLOAT_DEFINED 1 #endif // CGFLOAT_DEFINED -#endif // MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4 +#endif // GTM_MAC_OS_X_VERSION_MAXIMUM_ALLOWED <= MAC_OS_X_VERSION_10_4 |