Skip to content

Commit c5e0204

Browse files
committed
Move one more upstreamed Foundation patch on CI to devel branch
1 parent b30a44b commit c5e0204

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

swift-android-foundation-devel.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,19 @@ index e0d1cbbd..237c1daf 100644
361361
#endif
362362

363363
public struct HTTPCookiePropertyKey : RawRepresentable, Equatable, Hashable, Sendable {
364+
diff --git a/swift-corelibs-foundation/Sources/Testing/Testing.swift b/swift-corelibs-foundation/Sources/Testing/Testing.swift
365+
index 712d9dee..2483c14e 100644
366+
--- a/swift-corelibs-foundation/Sources/Testing/Testing.swift
367+
+++ b/swift-corelibs-foundation/Sources/Testing/Testing.swift
368+
@@ -11,6 +11,8 @@
369+
import Glibc
370+
#elseif canImport(Musl)
371+
import Musl
372+
+#elseif canImport(Bionic)
373+
+import Bionic
374+
#elseif os(WASI)
375+
import WASILibc
376+
#elseif canImport(CRT)
364377
diff --git a/swift-corelibs-foundation/Sources/plutil/main.swift b/swift-corelibs-foundation/Sources/plutil/main.swift
365378
index 29316d16..29584596 100644
366379
--- a/swift-corelibs-foundation/Sources/plutil/main.swift

swift-android-foundation-except-release.patch

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,3 @@ index 758dd1df..02970992 100644
2525
if !useFallbackChdir {
2626
try _throwIfPosixError(chdirResult)
2727
}
28-
diff --git a/swift-corelibs-foundation/Sources/Testing/Testing.swift b/swift-corelibs-foundation/Sources/Testing/Testing.swift
29-
index 712d9dee..2483c14e 100644
30-
--- a/swift-corelibs-foundation/Sources/Testing/Testing.swift
31-
+++ b/swift-corelibs-foundation/Sources/Testing/Testing.swift
32-
@@ -11,6 +11,8 @@
33-
import Glibc
34-
#elseif canImport(Musl)
35-
import Musl
36-
+#elseif canImport(Bionic)
37-
+import Bionic
38-
#elseif os(WASI)
39-
import WASILibc
40-
#elseif canImport(CRT)

0 commit comments

Comments
 (0)