Title: [262453] branches/safari-610.1.15-branch/Source/WebCore/PAL
- Revision
- 262453
- Author
- [email protected]
- Date
- 2020-06-02 14:58:32 -0700 (Tue, 02 Jun 2020)
Log Message
Cherry-pick r262347. rdar://problem/63891529
REGRESSION (r262332): Windows build failure because <nw/private.h> doesn't exist
<https://bugs.webkit.org/show_bug.cgi?id=212551>
<rdar://problem/62461099>
Unreviewed Windows build fix.
* pal/spi/cf/CFNetworkSPI.h:
- Move <nw/private.h> so it is not included with PLATFORM(WIN).
- Add or clean up some macro comments.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@262347 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.15-branch/Source/WebCore/PAL/ChangeLog (262452 => 262453)
--- branches/safari-610.1.15-branch/Source/WebCore/PAL/ChangeLog 2020-06-02 21:58:30 UTC (rev 262452)
+++ branches/safari-610.1.15-branch/Source/WebCore/PAL/ChangeLog 2020-06-02 21:58:32 UTC (rev 262453)
@@ -1,5 +1,33 @@
2020-06-02 Alan Coon <[email protected]>
+ Cherry-pick r262347. rdar://problem/63891529
+
+ REGRESSION (r262332): Windows build failure because <nw/private.h> doesn't exist
+ <https://bugs.webkit.org/show_bug.cgi?id=212551>
+ <rdar://problem/62461099>
+
+ Unreviewed Windows build fix.
+
+ * pal/spi/cf/CFNetworkSPI.h:
+ - Move <nw/private.h> so it is not included with PLATFORM(WIN).
+ - Add or clean up some macro comments.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@262347 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-05-30 David Kilzer <[email protected]>
+
+ REGRESSION (r262332): Windows build failure because <nw/private.h> doesn't exist
+ <https://bugs.webkit.org/show_bug.cgi?id=212551>
+ <rdar://problem/62461099>
+
+ Unreviewed Windows build fix.
+
+ * pal/spi/cf/CFNetworkSPI.h:
+ - Move <nw/private.h> so it is not included with PLATFORM(WIN).
+ - Add or clean up some macro comments.
+
+2020-06-02 Alan Coon <[email protected]>
+
Cherry-pick r262332. rdar://problem/63891529
[Cocoa] Improve logging quality for non-ephemeral sessions
Modified: branches/safari-610.1.15-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (262452 => 262453)
--- branches/safari-610.1.15-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2020-06-02 21:58:30 UTC (rev 262452)
+++ branches/safari-610.1.15-branch/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h 2020-06-02 21:58:32 UTC (rev 262453)
@@ -42,7 +42,6 @@
#include <CFNetwork/CFURLRequestPriv.h>
#include <CFNetwork/CFURLResponsePriv.h>
#include <CFNetwork/CFURLStorageSession.h>
-#include <nw/private.h>
#if PLATFORM(WIN)
@@ -56,8 +55,9 @@
WTF_EXTERN_C_END
-#else // PLATFORM(WIN)
+#else // !PLATFORM(WIN)
#include <CFNetwork/CFSocketStreamPriv.h>
+#include <nw/private.h>
#endif // PLATFORM(WIN)
// FIXME: Remove the defined(__OBJC__)-guard once we fix <rdar://problem/19033610>.
@@ -78,9 +78,8 @@
#ifndef NW_CONTEXT_HAS_PRIVACY_LEVEL_SILENT
#define NW_CONTEXT_HAS_PRIVACY_LEVEL_SILENT 1
#endif
+#endif // HAVE(LOGGING_PRIVACY_LEVEL)
-#endif
-
typedef CF_ENUM(int64_t, _TimingDataOptions)
{
_TimingDataOptionsEnableW3CNavigationTiming = (1 << 0)
@@ -297,7 +296,7 @@
#endif // defined(__OBJC__)
-#endif // !PLATFORM(WIN) && !USE(APPLE_INTERNAL_SDK)
+#endif // PLATFORM(WIN) || USE(APPLE_INTERNAL_SDK)
WTF_EXTERN_C_BEGIN
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
