diff --git a/src/sys/signal.rs b/src/sys/signal.rs index c1a2ac6deb..6429664766 100644 --- a/src/sys/signal.rs +++ b/src/sys/signal.rs @@ -784,7 +784,6 @@ impl SigAction { /// is the `SigAction` variant). `mask` specifies other signals to block during execution of /// the signal-catching function. pub fn new(handler: SigHandler, flags: SaFlags, mask: SigSet) -> SigAction { - #[cfg(not(target_os = "aix"))] unsafe fn install_sig(p: *mut libc::sigaction, handler: SigHandler) { unsafe { (*p).sa_sigaction = match handler { @@ -797,18 +796,6 @@ impl SigAction { } } - #[cfg(target_os = "aix")] - unsafe fn install_sig(p: *mut libc::sigaction, handler: SigHandler) { - unsafe { - (*p).sa_union.__su_sigaction = match handler { - SigHandler::SigDfl => unsafe { mem::transmute::(libc::SIG_DFL) }, - SigHandler::SigIgn => unsafe { mem::transmute::(libc::SIG_IGN) }, - SigHandler::Handler(f) => unsafe { mem::transmute::(f) }, - SigHandler::SigAction(f) => f, - }; - } - } - let mut s = mem::MaybeUninit::::uninit(); unsafe { let p = s.as_mut_ptr(); @@ -836,7 +823,6 @@ impl SigAction { } /// Returns the action's handler. - #[cfg(not(target_os = "aix"))] pub fn handler(&self) -> SigHandler { match self.sigaction.sa_sigaction { libc::SIG_DFL => SigHandler::SigDfl, @@ -869,26 +855,6 @@ impl SigAction { as extern "C" fn(libc::c_int)), } } - - /// Returns the action's handler. - #[cfg(target_os = "aix")] - pub fn handler(&self) -> SigHandler { - unsafe { - match self.sigaction.sa_union.__su_sigaction as usize { - libc::SIG_DFL => SigHandler::SigDfl, - libc::SIG_IGN => SigHandler::SigIgn, - p if self.flags().contains(SaFlags::SA_SIGINFO) => - SigHandler::SigAction( - *(&p as *const usize - as *const extern "C" fn(_, _, _)) - as extern "C" fn(_, _, _)), - p => SigHandler::Handler( - *(&p as *const usize - as *const extern "C" fn(libc::c_int)) - as extern "C" fn(libc::c_int)), - } - } - } } /// Changes the action taken by a process on receipt of a specific signal.