From 02d98bd11191650937e513cd0b52878de0474d7c Mon Sep 17 00:00:00 2001 From: "gtm.daemon" Date: Tue, 13 Jul 2010 19:37:40 +0000 Subject: [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) --- GTMDefines.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'GTMDefines.h') 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) -- cgit v1.2.3