iOS build fix after Yosemite build fix broke iOS build.
authorjer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Feb 2016 00:05:19 +0000 (00:05 +0000)
committerjer.noble@apple.com <jer.noble@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 4 Feb 2016 00:05:19 +0000 (00:05 +0000)
Source/WebCore:

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

Tools:

* TestWebKitAPI/Tests/WebCore/WebCoreNSURLSession.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196092 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h
Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm
Tools/ChangeLog
Tools/TestWebKitAPI/Tests/WebCore/WebCoreNSURLSession.mm

index b18e7ee..2cfebe4 100644 (file)
@@ -1,3 +1,10 @@
+2016-02-03  Jer Noble  <jer.noble@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  <bdakin@apple.com>
 
         Accepted candidates should not be autocorrected
index e12ecc2..c5d231a 100644 (file)
@@ -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 @@ WEBCORE_EXPORT @interface WebCoreNSURLSession : NSObject {
 
 NS_ASSUME_NONNULL_END
 
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#endif // PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
 
 #endif
index af91824..d8f6cb8 100644 (file)
@@ -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 @@ void WebCoreNSURLSessionDataTaskClient::notifyFinished(CachedResource* resource)
 }
 @end
 
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
+#endif // PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100
index 426d258..51a05d0 100644 (file)
@@ -1,5 +1,11 @@
 2016-02-03  Jer Noble  <jer.noble@apple.com>
 
+        iOS build fix after Yosemite build fix broke iOS build.
+
+        * TestWebKitAPI/Tests/WebCore/WebCoreNSURLSession.mm:
+
+2016-02-03  Jer Noble  <jer.noble@apple.com>
+
         Yosemite build fix; hide the entire WebCoreNSURLSessionDataTask class from Yosemite and prior.
 
         * TestWebKitAPI/Tests/WebCore/WebCoreNSURLSession.mm:
index 270f01e..ba78e2b 100644 (file)
@@ -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>