Changeset 141254 in webkit

Timestamp:

Jan 30, 2013 4:21:29 AM (11 years ago)

Author:

ddkilzer@apple.com

Message:

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCorePrefix.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/WebCorePrefix.h

@@ -1 +1 @@
 /*
- * 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
@@ -27 +27 @@
 
 /* Things that need to be defined globally should go into "config.h". */
+
+#include <wtf/Platform.h>
 
 #if defined(__APPLE__)
@@ -151 +153 @@
 #include <windows.h>
 #else
+#if !PLATFORM(IOS)
 #include <CoreServices/CoreServices.h>
-#endif
+#endif // !PLATFORM(IOS)
+#endif // defined(WIN32) || defined(_WIN32)
 
 #endif
@@ -158 +162 @@
 
 #ifdef __OBJC__
+#if PLATFORM(IOS)
+#import <Foundation/Foundation.h>
+#else
 #import <Cocoa/Cocoa.h>
+#endif // PLATFORM(IOS)
 #endif