Title: [176349] trunk/Source/WebCore
- Revision
- 176349
- Author
- [email protected]
- Date
- 2014-11-19 14:51:40 -0800 (Wed, 19 Nov 2014)
Log Message
Attempt to fix the Apple Internal Mountain Lion build after <https://trac.webkit.org/changeset/176347>
(https://bugs.webkit.org/show_bug.cgi?id=136863)
Only import header CFNSURLConnection.h when building for iOS or OS X Yosemite.
* platform/spi/cf/CFNetworkSPI.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (176348 => 176349)
--- trunk/Source/WebCore/ChangeLog 2014-11-19 22:40:00 UTC (rev 176348)
+++ trunk/Source/WebCore/ChangeLog 2014-11-19 22:51:40 UTC (rev 176349)
@@ -1,3 +1,12 @@
+2014-11-19 Daniel Bates <[email protected]>
+
+ Attempt to fix the Apple Internal Mountain Lion build after <https://trac.webkit.org/changeset/176347>
+ (https://bugs.webkit.org/show_bug.cgi?id=136863)
+
+ Only import header CFNSURLConnection.h when building for iOS or OS X Yosemite.
+
+ * platform/spi/cf/CFNetworkSPI.h:
+
2014-11-19 Antti Koivisto <[email protected]>
Fix TilesAdded bitmask
Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (176348 => 176349)
--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2014-11-19 22:40:00 UTC (rev 176348)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2014-11-19 22:51:40 UTC (rev 176349)
@@ -35,7 +35,8 @@
#include <CFNetwork/CFURLProtocolPriv.h>
#include <CFNetwork/CFURLRequest.h>
-#ifdef __OBJC__
+// FIXME: Remove the defined(__OBJC__)-guard onnce we fix <rdar://problem/19033610>.
+#if defined(__OBJC__) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
// FIXME: As a workaround for <rdar://problem/18337182>, we conditionally enclose the header
// in an extern "C" linkage block to make it suitable for C++ use.
#ifdef __cplusplus
@@ -47,7 +48,7 @@
#ifdef __cplusplus
}
#endif
-#endif // __OBJC__
+#endif // defined(__OBJC__) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)
#else
@@ -95,7 +96,7 @@
// FIXME: We should only forward declare this SPI when building for iOS without the Apple Internal SDK.
// As a workaround for <rdar://problem/19025016>, we must forward declare this SPI regardless of whether
// we are building with the Apple Internal SDK.
-#if PLATFORM(IOS) && defined(__OBJC__)
+#if defined(__OBJC__) && PLATFORM(IOS)
@interface NSURLCache (Details)
-(id)_initWithMemoryCapacity:(NSUInteger)memoryCapacity diskCapacity:(NSUInteger)diskCapacity relativePath:(NSString *)path;
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
