Skip to content

Fix: Replace sighandler_t with sig_t for Apple and BSDs #5008

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

Open
chengr4 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix: Replace sighandler_t with sig_t for Apple and BSDs #5008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90f6ea4
Test: Add variable `sig_t`
chengr4 Mar 9, 2026
d9d5db8
Fix: Replace `sighandler_t` with `sig_t for consistency across platf…
chengr4 Mar 9, 2026
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
1 change: 1 addition & 0 deletions libc-test/semver/apple.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2195,6 +2195,7 @@ shmctl
shmdt
shmget
shmid_ds
sig_t
sigaltstack
sigevent
siginfo_t
Expand Down
1 change: 1 addition & 0 deletions libc-test/semver/dragonfly.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1606,6 +1606,7 @@ shmat
shmctl
shmdt
shmget
sig_t
sigaltstack
sigevent
siginfo_t
Expand Down
1 change: 1 addition & 0 deletions libc-test/semver/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2368,6 +2368,7 @@ shmctl
shmdt
shmget
shmid_ds
sig_t
sigaltstack
sigevent
siginfo_t
Expand Down
1 change: 1 addition & 0 deletions libc-test/semver/netbsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1571,6 +1571,7 @@ shmctl
shmdt
shmget
shmid_ds
sig_t
sigaltstack
sigevent
siginfo_t
Expand Down
1 change: 1 addition & 0 deletions libc-test/semver/openbsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1332,6 +1332,7 @@ shmctl
shmdt
shmget
shmid_ds
sig_t
sigaltstack
siginfo_t
sigsuspend
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/apple/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ s! {

pub struct sigaction {
// FIXME(union): this field is actually a union
pub sa_sigaction: crate::sighandler_t,
pub sa_sigaction: crate::sig_t,
pub sa_mask: sigset_t,
pub sa_flags: c_int,
}
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/freebsdlike/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ s! {
}

pub struct sigaction {
pub sa_sigaction: crate::sighandler_t,
pub sa_sigaction: crate::sig_t,
pub sa_flags: c_int,
pub sa_mask: sigset_t,
}
Expand Down
2 changes: 1 addition & 1 deletion src/unix/bsd/netbsdlike/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ s! {
}

pub struct sigaction {
pub sa_sigaction: crate::sighandler_t,
pub sa_sigaction: crate::sig_t,
pub sa_mask: crate::sigset_t,
pub sa_flags: c_int,
}
Expand Down
12 changes: 12 additions & 0 deletions src/unix/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,18 @@ pub type pid_t = i32;
pub type in_addr_t = u32;
pub type in_port_t = u16;
pub type sighandler_t = size_t;
#[cfg(any(
target_os = "macos",
target_os = "ios",
target_os = "tvos",
target_os = "watchos",
target_os = "visionos",
target_os = "freebsd",
target_os = "dragonfly",
target_os = "openbsd",
target_os = "netbsd"
))]
pub type sig_t = sighandler_t;
pub type cc_t = c_uchar;

cfg_if! {
Expand Down
Loading