Title: [184216] trunk/Source/WebCore
- Revision
- 184216
- Author
- [email protected]
- Date
- 2015-05-12 14:02:41 -0700 (Tue, 12 May 2015)
Log Message
Build fix.
* platform/spi/cf/CFNetworkSPI.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (184215 => 184216)
--- trunk/Source/WebCore/ChangeLog 2015-05-12 20:46:34 UTC (rev 184215)
+++ trunk/Source/WebCore/ChangeLog 2015-05-12 21:02:41 UTC (rev 184216)
@@ -1,3 +1,9 @@
+2015-05-12 Alexey Proskuryakov <[email protected]>
+
+ Build fix.
+
+ * platform/spi/cf/CFNetworkSPI.h:
+
2015-05-12 Brent Fulgham <[email protected]>
ROLLOUT [Win] Unreviewed build fix for older DirectX build environments.
Modified: trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h (184215 => 184216)
--- trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-05-12 20:46:34 UTC (rev 184215)
+++ trunk/Source/WebCore/platform/spi/cf/CFNetworkSPI.h 2015-05-12 21:02:41 UTC (rev 184216)
@@ -125,15 +125,20 @@
EXTERN_C CFHTTPCookieStorageRef CFHTTPCookieStorageCreateFromIdentifyingData(CFAllocatorRef inAllocator, CFDataRef inData);
#endif
-#if defined(__OBJC__) && !USE(APPLE_INTERNAL_SDK)
+#if defined(__OBJC__)
+#if !USE(APPLE_INTERNAL_SDK) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED == 1090)
@interface NSHTTPCookieStorage (Details)
-#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
-+ (void)_setSharedHTTPCookieStorage:(NSHTTPCookieStorage *)storage;
-#endif
- (void)removeCookiesSinceDate:(NSDate *)date;
- (id)_initWithCFHTTPCookieStorage:(CFHTTPCookieStorageRef)cfStorage;
- (CFHTTPCookieStorageRef)_cookieStorage;
@end
#endif
+// FIXME: Move +_setSharedHTTPCookieStorage: into the above section under !USE(APPLE_INTERNAL_SDK) when possible (soon).
+#if (TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+@interface NSHTTPCookieStorage (Details)
++ (void)_setSharedHTTPCookieStorage:(NSHTTPCookieStorage *)storage;
+@end
+#endif
+#endif
#endif // CFNetworkSPI_h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
