Skip to content

Commit 74a6f60

Browse files
authored
Merge pull request #1555 from finagolfin/release/6.0
[6.0] Import new Bionic module and Android overlay
2 parents f31f7b6 + 3f00eba commit 74a6f60

File tree

7 files changed

+15
-1
lines changed

7 files changed

+15
-1
lines changed

Sources/LanguageServerProtocolJSONRPC/DisableSigpipe.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@
1414
import Glibc
1515
#elseif canImport(Musl)
1616
import Musl
17+
#elseif canImport(Android)
18+
import Android
1719
#endif
1820

19-
#if canImport(Glibc) || canImport(Musl)
21+
#if canImport(Glibc) || canImport(Musl) || canImport(Android)
2022
// This is a lazily initialised global variable that when read for the first time, will ignore SIGPIPE.
2123
private let globallyIgnoredSIGPIPE: Bool = {
2224
/* no F_SETNOSIGPIPE on Linux :( */

Sources/SKSupport/dlopen.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import Darwin
1919
import Glibc
2020
#elseif canImport(Musl)
2121
import Musl
22+
#elseif canImport(Android)
23+
import Android
2224
#endif
2325

2426
public final class DLHandle {

Sources/SourceKitD/SKDRequestArray.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import Glibc
1818
import Musl
1919
#elseif canImport(CRT)
2020
import CRT
21+
#elseif canImport(Bionic)
22+
import Bionic
2123
#endif
2224

2325
extension SourceKitD {

Sources/SourceKitD/SKDRequestDictionary.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import Glibc
1919
import Musl
2020
#elseif canImport(CRT)
2121
import CRT
22+
#elseif canImport(Bionic)
23+
import Bionic
2224
#endif
2325

2426
/// Values that can be stored in a `SKDRequestDictionary`.

Sources/SourceKitD/SKDResponse.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import Glibc
1919
import Musl
2020
#elseif canImport(CRT)
2121
import CRT
22+
#elseif canImport(Bionic)
23+
import Bionic
2224
#endif
2325

2426
public final class SKDResponse: Sendable {

Sources/SourceKitD/SKDResponseArray.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import Glibc
1818
import Musl
1919
#elseif canImport(CRT)
2020
import CRT
21+
#elseif canImport(Bionic)
22+
import Bionic
2123
#endif
2224

2325
public final class SKDResponseArray: Sendable {

Sources/SourceKitD/SKDResponseDictionary.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ import Glibc
1818
import Musl
1919
#elseif canImport(CRT)
2020
import CRT
21+
#elseif canImport(Bionic)
22+
import Bionic
2123
#endif
2224

2325
public final class SKDResponseDictionary: Sendable {

0 commit comments

Comments
 (0)