Skip to content

OpenBSD 7.8 will require OpaquePointer for FILE. #84478

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
merged 1 commit into from
Sep 27, 2025
Merged

OpenBSD 7.8 will require OpaquePointer for FILE. #84478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion stdlib/private/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ if(SWIFT_BUILD_SDK_OVERLAY
endif()
# Currently SwiftReflectionTest cannot be built on Windows, due to
# dependencies on POSIX symbols
if (SWIFT_INCLUDE_TESTS AND (NOT CMAKE_SYSTEM_NAME STREQUAL "Windows"))
if (SWIFT_INCLUDE_TESTS
AND NOT CMAKE_SYSTEM_NAME STREQUAL "Windows"
AND NOT (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD"
AND CMAKE_SYSTEM_VERSION VERSION_LESS "7.8"))
add_subdirectory(SwiftReflectionTest)
endif()
endif()
Expand Down
6 changes: 3 additions & 3 deletions stdlib/public/Platform/Platform.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ public func snprintf(ptr: UnsafeMutablePointer<Int8>, _ len: Int, _ format: Unsa
#endif

#elseif os(OpenBSD)
public var stdin: UnsafeMutablePointer<FILE> { return _swift_stdlib_stdin() }
public var stdout: UnsafeMutablePointer<FILE> { return _swift_stdlib_stdout() }
public var stderr: UnsafeMutablePointer<FILE> { return _swift_stdlib_stderr() }
public var stdin: OpaquePointer { return OpaquePointer(_swift_stdlib_stdin()) }
public var stdout: OpaquePointer { return OpaquePointer(_swift_stdlib_stdout()) }
public var stderr: OpaquePointer { return OpaquePointer(_swift_stdlib_stderr()) }
#elseif os(Windows)
public var stdin: UnsafeMutablePointer<FILE> {
return unsafe __acrt_iob_func(0)
Expand Down
6 changes: 3 additions & 3 deletions stdlib/public/SwiftShims/swift/shims/LibcOverlayShims.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,15 +121,15 @@ int static inline _swift_stdlib_openat(int fd, const char *path, int oflag,
#endif

#if defined(__OpenBSD__)
static inline FILE *_swift_stdlib_stdin(void) {
static inline void *_swift_stdlib_stdin(void) {
return stdin;
}

static inline FILE *_swift_stdlib_stdout(void) {
static inline void *_swift_stdlib_stdout(void) {
return stdout;
}

static inline FILE *_swift_stdlib_stderr(void) {
static inline void *_swift_stdlib_stderr(void) {
return stderr;
}
#endif
Expand Down