Attempt build fixes for 32-bit after 159724.
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 Nov 2013 03:43:57 +0000 (03:43 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 23 Nov 2013 03:43:57 +0000 (03:43 +0000)
There's probably a better fix, but this will work for now.

* UIProcess/API/mac/WKView.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@159725 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/mac/WKView.h

index cd27a96..f46f4c5 100644 (file)
@@ -1,3 +1,11 @@
+2013-11-22  Tim Horton  <timothy_horton@apple.com>
+
+        Attempt build fixes for 32-bit after 159724.
+
+        There's probably a better fix, but this will work for now.
+
+        * UIProcess/API/mac/WKView.h:
+
 2013-11-22  Enrica Casucci  <enrica@apple.com>
 
         Upstream iOS WebKit2 to OpenSource (part 3).
index 297aa61..e9a3bac 100644 (file)
@@ -23,6 +23,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <TargetConditionals.h>
+
 #if TARGET_OS_IPHONE
 #import <UIKit/UIKit.h>
 #else
@@ -47,8 +49,13 @@ WK_EXPORT
     unsigned _unused;
 }
 
+#if TARGET_OS_IPHONE
 - (id)initWithFrame:(CGRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup;
 - (id)initWithFrame:(CGRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup relatedToView:(WKView *)relatedView;
+#else
+- (id)initWithFrame:(NSRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup;
+- (id)initWithFrame:(NSRect)frame processGroup:(WKProcessGroup *)processGroup browsingContextGroup:(WKBrowsingContextGroup *)browsingContextGroup relatedToView:(WKView *)relatedView;
+#endif
 
 @property(readonly) WKBrowsingContextController *browsingContextController;