diff options
| author |  gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2010-07-13 19:37:40 +0000 |
|---|---|---|
| committer | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2010-07-13 19:37:40 +0000 |
| commit | 02d98bd11191650937e513cd0b52878de0474d7c (patch) | |
| tree | a22f97303dd61e732acbc1435ac7ea36398b9ca7 /GTMDefines.h | |
| parent | e2bb8aa49243734ea094c0c81a072f7570507d95 (diff) | |
[Author: dmaclach]
Put a guard around the protocol definitions for Chromium who want to be
able to control them. Also needed for QSB due to bringing in GTMDefines
from a variety of sources.
R=grobbins
DELTA=3 (1 added, 0 deleted, 2 changed)
Diffstat (limited to 'GTMDefines.h')
| -rw-r--r-- | GTMDefines.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/GTMDefines.h b/GTMDefines.h index 76b7947..62c5544 100644 --- a/GTMDefines.h +++ b/GTMDefines.h @@ -338,7 +338,8 @@ GTM_EXTERN void _GTMUnitTestDevLog(NSString *format, ...); // To simplify support for both Leopard and Snow Leopard we declare // the Snow Leopard protocols that we need here. -#if !(MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) +#if !defined(GTM_10_6_PROTOCOLS_DEFINED) && !(MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) +#define GTM_10_6_PROTOCOLS_DEFINED 1 @protocol NSConnectionDelegate @end @protocol NSAnimationDelegate @@ -347,4 +348,4 @@ GTM_EXTERN void _GTMUnitTestDevLog(NSString *format, ...); @end @protocol NSTabViewDelegate @end -#endif // !(MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) +#endif // !defined(GTM_10_6_PROTOCOLS_DEFINED) && !(MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) |