Skip to content

netbsd/mod.rs: fix so that self-tests pass on both ilp32 and lp64. #4904

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
he32 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

netbsd/mod.rs: fix so that self-tests pass on both ilp32 and lp64. #4904

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
11 changes: 8 additions & 3 deletions src/unix/bsd/netbsdlike/netbsd/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ impl siginfo_t {
_si_signo: c_int,
_si_errno: c_int,
_si_code: c_int,
#[cfg(target_pointer_width = "64")]
__pad1: Padding<c_int>,
_pid: crate::pid_t,
}
Expand All @@ -91,6 +92,7 @@ impl siginfo_t {
_si_signo: c_int,
_si_errno: c_int,
_si_code: c_int,
#[cfg(target_pointer_width = "64")]
__pad1: Padding<c_int>,
_pid: crate::pid_t,
_uid: crate::uid_t,
Expand All @@ -104,6 +106,7 @@ impl siginfo_t {
_si_signo: c_int,
_si_errno: c_int,
_si_code: c_int,
#[cfg(target_pointer_width = "64")]
__pad1: Padding<c_int>,
_pid: crate::pid_t,
_uid: crate::uid_t,
Expand All @@ -118,12 +121,10 @@ impl siginfo_t {
_si_signo: c_int,
_si_errno: c_int,
_si_code: c_int,
#[cfg(target_pointer_width = "64")]
__pad1: Padding<c_int>,
_pid: crate::pid_t,
_uid: crate::uid_t,
_value: crate::sigval,
_cpid: crate::pid_t,
_cuid: crate::uid_t,
status: c_int,
}
(*(self as *const siginfo_t as *const siginfo_timer)).status
Expand Down Expand Up @@ -210,9 +211,13 @@ s! {
pub si_signo: c_int,
pub si_code: c_int,
pub si_errno: c_int,
#[cfg(target_pointer_width = "64")]
__pad1: Padding<c_int>,
pub si_addr: *mut c_void,
#[cfg(target_pointer_width = "64")]
__pad2: Padding<[u64; 13]>,
#[cfg(target_pointer_width = "32")]
__pad2: Padding<[u64; 14]>,
}

pub struct pthread_attr_t {
Expand Down