Changeset 264294 in webkit

Timestamp:

Jul 12, 2020, 11:28:24 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Building CFNetworkSPI with the macOS Big Sur public SDK fails
​https://bugs.webkit.org/show_bug.cgi?id=214238

Patch by Rob Buis <​rbuis@igalia.com> on 2020-07-12
Reviewed by Darin Adler.

Building CFNetworkSPI with the macOS Big Sur public SDK fails bacause
it has Objective-C declarations in a header that’s included by a
non-Objective-C source file, to fix wrap the declarations in a
defined(OBJC) block.

• pal/spi/cf/CFNetworkSPI.h:

Location:

trunk/Source/WebCore/PAL

Files:

• ChangeLog (modified) (1 diff)
• pal/spi/cf/CFNetworkSPI.h (modified) (2 diffs)

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2020-07-12  Rob Buis  <rbuis@igalia.com>
+
+        Building CFNetworkSPI with the macOS Big Sur public SDK fails
+        https://bugs.webkit.org/show_bug.cgi?id=214238
+
+        Reviewed by Darin Adler.
+
+        Building CFNetworkSPI with the macOS Big Sur public SDK fails bacause
+        it has Objective-C declarations in a header that’s included by a
+        non-Objective-C source file, to fix wrap the declarations in a
+        defined(__OBJC__) block.
+
+        * pal/spi/cf/CFNetworkSPI.h:
+
 2020-07-12  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h

@@ -68 +68 @@
 #else // !PLATFORM(WIN) && !USE(APPLE_INTERNAL_SDK)
 
-#if HAVE(PRECONNECT_PING)
+#if HAVE(PRECONNECT_PING) && defined(__OBJC__)
+
 @interface _NSHTTPConnectionInfo : NSObject
 - (void)sendPingWithReceiveHandler:(void (^)(NSError * _Nullable error, NSTimeInterval interval))pongHandler;
@@ -77 +78 @@
 - (void)getUnderlyingHTTPConnectionInfoWithCompletionHandler:(void (^)(_NSHTTPConnectionInfo *connectionInfo))completionHandler;
 @end
-#endif // HAVE(PRECONNECT_PING)
+
+#endif // HAVE(PRECONNECT_PING) && defined(__OBJC__)
 
 #if HAVE(LOGGING_PRIVACY_LEVEL)