BUILD FIX: Make WebCorePrefix.h build on iOS
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Jan 2013 12:21:29 +0000 (12:21 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Jan 2013 12:21:29 +0000 (12:21 +0000)
<http://webkit.org/b/108224>

Reviewed by Sam Weinig.

* WebCorePrefix.h:
- Include <wtf/Platform.h>.
- Do not include <CoreServices/CoreServices.h> on iOS.
- Include <Foundation/Foundation.h> instead of <Cocoa/Cocoa.h>
  on iOS.

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

Source/WebCore/ChangeLog
Source/WebCore/WebCorePrefix.h

index 83175fe..8101723 100644 (file)
@@ -1,3 +1,16 @@
+2013-01-30  David Kilzer  <ddkilzer@apple.com>
+
+        BUILD FIX: Make WebCorePrefix.h build on iOS
+        <http://webkit.org/b/108224>
+
+        Reviewed by Sam Weinig.
+
+        * WebCorePrefix.h:
+        - Include <wtf/Platform.h>.
+        - Do not include <CoreServices/CoreServices.h> on iOS.
+        - Include <Foundation/Foundation.h> instead of <Cocoa/Cocoa.h>
+          on iOS.
+
 2013-01-30  Patrick Gansterer  <paroga@webkit.org>
 
         Build fix for WinCE after r141156.
index 495c6ec..c66880b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2013 Apple Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -27,6 +27,8 @@
 
 /* Things that need to be defined globally should go into "config.h". */
 
+#include <wtf/Platform.h>
+
 #if defined(__APPLE__)
 #ifdef __cplusplus
 #define NULL __null
@@ -150,14 +152,20 @@ _LIBCPP_END_NAMESPACE_STD
 #include <CFNetwork/CFNetwork.h>
 #include <windows.h>
 #else
+#if !PLATFORM(IOS)
 #include <CoreServices/CoreServices.h>
-#endif
+#endif // !PLATFORM(IOS)
+#endif // defined(WIN32) || defined(_WIN32)
 
 #endif
 #endif // !defined(BUILDING_WX__)
 
 #ifdef __OBJC__
+#if PLATFORM(IOS)
+#import <Foundation/Foundation.h>
+#else
 #import <Cocoa/Cocoa.h>
+#endif // PLATFORM(IOS)
 #endif
 
 #ifdef __cplusplus