Skip to content

Commit 179242e

Browse files
committed
Auto merge of #2727 - redox-os:redox-0.2.120, r=Amanieu
redox: add siginfo_t and rename sa_handler to sa_sigaction This improves support for crates like signal_hook_registry
2 parents 3beb97c + 20b7e44 commit 179242e

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/unix/redox/mod.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,20 @@ s! {
151151
}
152152

153153
pub struct sigaction {
154-
pub sa_handler: ::sighandler_t,
154+
pub sa_sigaction: ::sighandler_t,
155155
pub sa_flags: ::c_ulong,
156156
pub sa_restorer: ::Option<extern fn()>,
157157
pub sa_mask: ::sigset_t,
158158
}
159159

160+
pub struct siginfo_t {
161+
pub si_signo: ::c_int,
162+
pub si_errno: ::c_int,
163+
pub si_code: ::c_int,
164+
_pad: [::c_int; 29],
165+
_align: [usize; 0],
166+
}
167+
160168
pub struct sockaddr {
161169
pub sa_family: ::sa_family_t,
162170
pub sa_data: [::c_char; 14],

0 commit comments

Comments
 (0)