Title: [196092] trunk
Revision
196092
Author
jer.no...@apple.com
Date
2016-02-03 16:05:19 -0800 (Wed, 03 Feb 2016)

Log Message

iOS build fix after Yosemite build fix broke iOS build.

Source/WebCore:

* platform/network/cocoa/WebCoreNSURLSession.h:
* platform/network/cocoa/WebCoreNSURLSession.mm:

Tools:

* TestWebKitAPI/Tests/WebCore/WebCoreNSURLSession.mm:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (196091 => 196092)


--- trunk/Source/WebCore/ChangeLog	2016-02-04 00:04:34 UTC (rev 196091)
+++ trunk/Source/WebCore/ChangeLog	2016-02-04 00:05:19 UTC (rev 196092)
@@ -1,3 +1,10 @@
+2016-02-03  Jer Noble  <jer.no...@apple.com>
+
+        iOS build fix after Yosemite build fix broke iOS build.
+
+        * platform/network/cocoa/WebCoreNSURLSession.h:
+        * platform/network/cocoa/WebCoreNSURLSession.mm:
+
 2016-02-03  Beth Dakin  <bda...@apple.com>
 
         Accepted candidates should not be autocorrected

Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h (196091 => 196092)


--- trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h	2016-02-04 00:04:34 UTC (rev 196091)
+++ trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h	2016-02-04 00:05:19 UTC (rev 196092)
@@ -26,7 +26,7 @@
 #ifndef WebCoreNSURLSession_h
 #define WebCoreNSURLSession_h
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
 
 #import "CachedRawResource.h"
 #import "CachedResourceHandle.h"
@@ -131,6 +131,6 @@
 
 NS_ASSUME_NONNULL_END
 
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#endif // PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
 
 #endif

Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm (196091 => 196092)


--- trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm	2016-02-04 00:04:34 UTC (rev 196091)
+++ trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm	2016-02-04 00:05:19 UTC (rev 196092)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "WebCoreNSURLSession.h"
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
 
 #import "CachedRawResource.h"
 #import "CachedResourceLoader.h"
@@ -541,4 +541,4 @@
 }
 @end
 
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#endif // PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100

Modified: trunk/Tools/ChangeLog (196091 => 196092)


--- trunk/Tools/ChangeLog	2016-02-04 00:04:34 UTC (rev 196091)
+++ trunk/Tools/ChangeLog	2016-02-04 00:05:19 UTC (rev 196092)
@@ -1,5 +1,11 @@
 2016-02-03  Jer Noble  <jer.no...@apple.com>
 
+        iOS build fix after Yosemite build fix broke iOS build.
+
+        * TestWebKitAPI/Tests/WebCore/WebCoreNSURLSession.mm:
+
+2016-02-03  Jer Noble  <jer.no...@apple.com>
+
         Yosemite build fix; hide the entire WebCoreNSURLSessionDataTask class from Yosemite and prior.
 
         * TestWebKitAPI/Tests/WebCore/WebCoreNSURLSession.mm:

Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/WebCoreNSURLSession.mm (196091 => 196092)


--- trunk/Tools/TestWebKitAPI/Tests/WebCore/WebCoreNSURLSession.mm	2016-02-04 00:04:34 UTC (rev 196091)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/WebCoreNSURLSession.mm	2016-02-04 00:05:19 UTC (rev 196092)
@@ -25,7 +25,7 @@
 
 #import "config.h"
 
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
 
 #import "PlatformUtilities.h"
 #import <WebKit/WebView.h>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to