diff options
| author | Steve Block <steveblock@google.com> | 2010-07-08 12:51:48 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-07-09 15:33:40 +0100 |
| commit | ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24 (patch) | |
| tree | bb45155550ec013adc0ad10f4d7d354c6469b022 /WebKitLibraries/WebKitSystemInterface.h | |
| parent | d4b24d9a829ed7de70381c8b99fb75a07ab40466 (diff) | |
| download | external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.zip external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.tar.gz external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.tar.bz2 | |
Merge WebKit at r62496: Initial merge by git
Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
Diffstat (limited to 'WebKitLibraries/WebKitSystemInterface.h')
| -rw-r--r-- | WebKitLibraries/WebKitSystemInterface.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/WebKitLibraries/WebKitSystemInterface.h b/WebKitLibraries/WebKitSystemInterface.h index a753b63..4f46719 100644 --- a/WebKitLibraries/WebKitSystemInterface.h +++ b/WebKitLibraries/WebKitSystemInterface.h @@ -256,7 +256,7 @@ typedef enum { NSControl *WKCreateMediaUIControl(int controlType); -#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && defined(__x86_64__) +#if !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) mach_port_t WKInitializeRenderServer(void); @class CALayer; @@ -277,6 +277,7 @@ uint32_t WKCARemoteLayerClientGetClientId(WKCARemoteLayerClientRef); void WKCARemoteLayerClientSetLayer(WKCARemoteLayerClientRef, CALayer *); CALayer *WKCARemoteLayerClientGetLayer(WKCARemoteLayerClientRef); +#if defined(__x86_64__) #import <mach/mig.h> CFRunLoopSourceRef WKCreateMIGServerSource(mig_subsystem_t subsystem, mach_port_t serverPort); @@ -284,8 +285,8 @@ CFRunLoopSourceRef WKCreateMIGServerSource(mig_subsystem_t subsystem, mach_port_ NSUInteger WKGetInputPanelWindowStyle(void); UInt8 WKGetNSEventKeyChar(NSEvent *); - -#endif +#endif // defined(__x86_64__) +#endif // !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) @class CAPropertyAnimation; void WKSetCAAnimationValueFunction(CAPropertyAnimation*, NSString* function); |