Skip to content

Guard errnos not available on FreeBSD #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michael-yuji merged 4 commits into from
Jan 18, 2025
Merged

Guard errnos not available on FreeBSD #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e73a33
Guard errnos not available on FreeBSD
michael-yuji Jan 17, 2025
a4fb6cb
Keep order consistent
michael-yuji Jan 17, 2025
eb566de
Fix tests on FreeBSD
michael-yuji Jan 17, 2025
0d824ee
refactor ifdef in test
michael-yuji Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Sources/System/Errno.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1294,7 +1294,7 @@ public struct Errno: RawRepresentable, Error, Hashable, Codable {
@available(*, unavailable, renamed: "multiHop")
public static var EMULTIHOP: Errno { multiHop }

#if !os(WASI)
#if !os(WASI) && !os(FreeBSD)
/// No message available.
///
/// No message was available to be received by the requested operation.
Expand All @@ -1320,7 +1320,7 @@ public struct Errno: RawRepresentable, Error, Hashable, Codable {
@available(*, unavailable, renamed: "noLink")
public static var ENOLINK: Errno { noLink }

#if !os(WASI)
#if !os(WASI) && !os(FreeBSD)
/// Reserved.
///
/// This error is reserved for future use.
Expand Down Expand Up @@ -1361,7 +1361,7 @@ public struct Errno: RawRepresentable, Error, Hashable, Codable {
@available(*, unavailable, renamed: "protocolError")
public static var EPROTO: Errno { protocolError }

#if !os(OpenBSD) && !os(WASI)
#if !os(OpenBSD) && !os(WASI) && !os(FreeBSD)
/// Reserved.
///
/// This error is reserved for future use.
Expand Down
6 changes: 3 additions & 3 deletions Sources/System/Internals/Constants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,15 +422,15 @@ internal var _EBADMSG: CInt { EBADMSG }
@_alwaysEmitIntoClient
internal var _EMULTIHOP: CInt { EMULTIHOP }

#if !os(WASI)
#if !os(WASI) && !os(FreeBSD)
@_alwaysEmitIntoClient
internal var _ENODATA: CInt { ENODATA }
#endif

@_alwaysEmitIntoClient
internal var _ENOLINK: CInt { ENOLINK }

#if !os(WASI)
#if !os(WASI) && !os(FreeBSD)
@_alwaysEmitIntoClient
internal var _ENOSR: CInt { ENOSR }

Expand All @@ -442,7 +442,7 @@ internal var _ENOSTR: CInt { ENOSTR }
@_alwaysEmitIntoClient
internal var _EPROTO: CInt { EPROTO }

#if !os(OpenBSD) && !os(WASI)
#if !os(OpenBSD) && !os(WASI) && !os(FreeBSD)
@_alwaysEmitIntoClient
internal var _ETIME: CInt { ETIME }
#endif
Expand Down
2 changes: 1 addition & 1 deletion Sources/System/Internals/Syscalls.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ internal func system_confstr(
internal let SYSTEM_AT_REMOVE_DIR = AT_REMOVEDIR
internal let SYSTEM_DT_DIR = DT_DIR
internal typealias system_dirent = dirent
#if os(Linux) || os(Android)
#if os(Linux) || os(Android) || os(FreeBSD)
internal typealias system_DIRPtr = OpaquePointer
#else
internal typealias system_DIRPtr = UnsafeMutablePointer<DIR>
Expand Down
8 changes: 6 additions & 2 deletions Tests/SystemTests/ErrnoTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,17 @@ final class ErrnoTest: XCTestCase {
#if !os(Windows)
XCTAssert(EBADMSG == Errno.badMessage.rawValue)
XCTAssert(EMULTIHOP == Errno.multiHop.rawValue)
XCTAssert(ENODATA == Errno.noData.rawValue)
XCTAssert(ENOLINK == Errno.noLink.rawValue)
XCTAssert(EPROTO == Errno.protocolError.rawValue)
#endif

#if !os(Windows) && !os(FreeBSD)
XCTAssert(ENODATA == Errno.noData.rawValue)
XCTAssert(ENOSR == Errno.noStreamResources.rawValue)
XCTAssert(ENOSTR == Errno.notStream.rawValue)
XCTAssert(EPROTO == Errno.protocolError.rawValue)
XCTAssert(ETIME == Errno.timeout.rawValue)
#endif

XCTAssert(EOPNOTSUPP == Errno.notSupportedOnSocket.rawValue)

// From headers but not man page
Expand Down