summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-03-18 15:59:51 +0000
committerbors <bors@rust-lang.org>2022-03-18 15:59:51 +0000
commit179242ec7be96c1b2a2492f86e73c137e516024c (patch)
tree215f4185fa860c84eb963c0e5fbd9019389203b8
parent3beb97c01c0880f8aca73deccb6e172d77b5af77 (diff)
parent20b7e44baa26da0b7c5cc06a916e142ac89382b1 (diff)
downloadrust-libc-179242ec7be96c1b2a2492f86e73c137e516024c.tar.gz
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
-rw-r--r--src/unix/redox/mod.rs10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/unix/redox/mod.rs b/src/unix/redox/mod.rs
index 9836551d94..bc46d4942a 100644
--- a/src/unix/redox/mod.rs
+++ b/src/unix/redox/mod.rs
@@ -151,12 +151,20 @@ s! {
}
pub struct sigaction {
- pub sa_handler: ::sighandler_t,
+ pub sa_sigaction: ::sighandler_t,
pub sa_flags: ::c_ulong,
pub sa_restorer: ::Option<extern fn()>,
pub sa_mask: ::sigset_t,
}
+ pub struct siginfo_t {
+ pub si_signo: ::c_int,
+ pub si_errno: ::c_int,
+ pub si_code: ::c_int,
+ _pad: [::c_int; 29],
+ _align: [usize; 0],
+ }
+
pub struct sockaddr {
pub sa_family: ::sa_family_t,
pub sa_data: [::c_char; 14],