Skip to content

Commit

Permalink
Merge pull request #1555 from finagolfin/release/6.0
Browse files Browse the repository at this point in the history
[6.0] Import new Bionic module and Android overlay
  • Loading branch information
ahoppen authored Jul 15, 2024
2 parents f31f7b6 + 3f00eba commit 74a6f60
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Sources/LanguageServerProtocolJSONRPC/DisableSigpipe.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
import Glibc
#elseif canImport(Musl)
import Musl
#elseif canImport(Android)
import Android
#endif

#if canImport(Glibc) || canImport(Musl)
#if canImport(Glibc) || canImport(Musl) || canImport(Android)
// This is a lazily initialised global variable that when read for the first time, will ignore SIGPIPE.
private let globallyIgnoredSIGPIPE: Bool = {
/* no F_SETNOSIGPIPE on Linux :( */
Expand Down
2 changes: 2 additions & 0 deletions Sources/SKSupport/dlopen.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import Darwin
import Glibc
#elseif canImport(Musl)
import Musl
#elseif canImport(Android)
import Android
#endif

public final class DLHandle {
Expand Down
2 changes: 2 additions & 0 deletions Sources/SourceKitD/SKDRequestArray.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import Glibc
import Musl
#elseif canImport(CRT)
import CRT
#elseif canImport(Bionic)
import Bionic
#endif

extension SourceKitD {
Expand Down
2 changes: 2 additions & 0 deletions Sources/SourceKitD/SKDRequestDictionary.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import Glibc
import Musl
#elseif canImport(CRT)
import CRT
#elseif canImport(Bionic)
import Bionic
#endif

/// Values that can be stored in a `SKDRequestDictionary`.
Expand Down
2 changes: 2 additions & 0 deletions Sources/SourceKitD/SKDResponse.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import Glibc
import Musl
#elseif canImport(CRT)
import CRT
#elseif canImport(Bionic)
import Bionic
#endif

public final class SKDResponse: Sendable {
Expand Down
2 changes: 2 additions & 0 deletions Sources/SourceKitD/SKDResponseArray.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import Glibc
import Musl
#elseif canImport(CRT)
import CRT
#elseif canImport(Bionic)
import Bionic
#endif

public final class SKDResponseArray: Sendable {
Expand Down
2 changes: 2 additions & 0 deletions Sources/SourceKitD/SKDResponseDictionary.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import Glibc
import Musl
#elseif canImport(CRT)
import CRT
#elseif canImport(Bionic)
import Bionic
#endif

public final class SKDResponseDictionary: Sendable {
Expand Down

0 comments on commit 74a6f60

Please sign in to comment.