diff options
| author | Steve Block <steveblock@google.com> | 2010-05-26 10:11:43 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-27 11:14:42 +0100 |
| commit | e78cbe89e6f337f2f1fe40315be88f742b547151 (patch) | |
| tree | d778000b84a04f24bbad50c7fa66244365e960e9 /WebCore/platform/mac | |
| parent | 7b582e96e4e909ed7dba1e07153d20fbddaec3f7 (diff) | |
| download | external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.zip external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.gz external_webkit-e78cbe89e6f337f2f1fe40315be88f742b547151.tar.bz2 | |
Merge WebKit at r60074: Initial merge by git
Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
Diffstat (limited to 'WebCore/platform/mac')
| -rw-r--r-- | WebCore/platform/mac/EmptyProtocolDefinitions.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/WebCore/platform/mac/EmptyProtocolDefinitions.h b/WebCore/platform/mac/EmptyProtocolDefinitions.h index 4d4d373..b73177b 100644 --- a/WebCore/platform/mac/EmptyProtocolDefinitions.h +++ b/WebCore/platform/mac/EmptyProtocolDefinitions.h @@ -25,10 +25,6 @@ #if defined(__OBJC__) -#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) -#include <Foundation/NSPrivateDecls.h> -#endif - #define EMPTY_PROTOCOL(NAME) \ @protocol NAME <NSObject> \ @end @@ -41,7 +37,7 @@ EMPTY_PROTOCOL(NSWindowDelegate) #endif -#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD) || !defined(__COCOA_FORMAL_PROTOCOLS_2__) +#if defined(BUILDING_ON_TIGER) || defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD) EMPTY_PROTOCOL(NSURLConnectionDelegate) EMPTY_PROTOCOL(NSURLDownloadDelegate) |