Title: [141254] trunk/Source/WebCore
- Revision
- 141254
- Author
- [email protected]
- Date
- 2013-01-30 04:21:29 -0800 (Wed, 30 Jan 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (141253 => 141254)
--- trunk/Source/WebCore/ChangeLog 2013-01-30 12:20:25 UTC (rev 141253)
+++ trunk/Source/WebCore/ChangeLog 2013-01-30 12:21:29 UTC (rev 141254)
@@ -1,3 +1,16 @@
+2013-01-30 David Kilzer <[email protected]>
+
+ 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 <[email protected]>
Build fix for WinCE after r141156.
Modified: trunk/Source/WebCore/WebCorePrefix.h (141253 => 141254)
--- trunk/Source/WebCore/WebCorePrefix.h 2013-01-30 12:20:25 UTC (rev 141253)
+++ trunk/Source/WebCore/WebCorePrefix.h 2013-01-30 12:21:29 UTC (rev 141254)
@@ -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 @@
#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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
