Title: [280386] branches/safari-612.1.25-branch/Source/WebCore/PAL
- Revision
- 280386
- Author
- [email protected]
- Date
- 2021-07-28 09:02:03 -0700 (Wed, 28 Jul 2021)
Log Message
Cherry-pick r280384. rdar://problem/81218821
Fix build with SDKs containing new CFNetwork SPI declaration
https://bugs.webkit.org/show_bug.cgi?id=228553
<rdar://81202574>
Reviewed by Brady Eidson.
CFNSURLConnection.h also has "@interface NSURLSessionConfiguration ()"
ObjC doesn't like it if you have the exact same thing in the parentheses and a duplicate declaration.
I reproduced the build failure with a modified SDK and verified this fixes it.
* pal/spi/cf/CFNetworkSPI.h:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280384 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.25-branch/Source/WebCore/PAL/ChangeLog (280385 => 280386)
--- branches/safari-612.1.25-branch/Source/WebCore/PAL/ChangeLog 2021-07-28 15:57:49 UTC (rev 280385)
+++ branches/safari-612.1.25-branch/Source/WebCore/PAL/ChangeLog 2021-07-28 16:02:03 UTC (rev 280386)
@@ -1,3 +1,37 @@
+2021-07-28 Alan Coon <[email protected]>
+
+ Cherry-pick r280384. rdar://problem/81218821
+
+ Fix build with SDKs containing new CFNetwork SPI declaration
+ https://bugs.webkit.org/show_bug.cgi?id=228553
+ <rdar://81202574>
+
+ Reviewed by Brady Eidson.
+
+ CFNSURLConnection.h also has "@interface NSURLSessionConfiguration ()"
+ ObjC doesn't like it if you have the exact same thing in the parentheses and a duplicate declaration.
+ I reproduced the build failure with a modified SDK and verified this fixes it.
+
+ * pal/spi/cf/CFNetworkSPI.h:
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280384 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-07-28 Alex Christensen <[email protected]>
+
+ Fix build with SDKs containing new CFNetwork SPI declaration
+ https://bugs.webkit.org/show_bug.cgi?id=228553
+ <rdar://81202574>
+
+ Reviewed by Brady Eidson.
+
+ CFNSURLConnection.h also has "@interface NSURLSessionConfiguration ()"
+ ObjC doesn't like it if you have the exact same thing in the parentheses and a duplicate declaration.
+ I reproduced the build failure with a modified SDK and verified this fixes it.
+
+ * pal/spi/cf/CFNetworkSPI.h:
+
2021-07-21 Chris Dumez <[email protected]>
Unreviewed, reverting r280129.
Modified: branches/safari-612.1.25-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (280385 => 280386)
--- branches/safari-612.1.25-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2021-07-28 15:57:49 UTC (rev 280385)
+++ branches/safari-612.1.25-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2021-07-28 16:02:03 UTC (rev 280386)
@@ -488,7 +488,7 @@
- (void)_setMIMEType:(NSString *)type;
@end
-@interface NSURLSessionConfiguration ()
+@interface NSURLSessionConfiguration (SPI)
// FIXME: Remove this once rdar://problem/40650244 is in a build.
@property (copy) NSDictionary *_socketStreamProperties;
// FIXME: Remove this once rdar://80550123 is in a build.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
