From e6bfbbb810ee1c86138ebb6ce8610e403cb83945 Mon Sep 17 00:00:00 2001 From: David Hou Date: Sat, 5 Nov 2016 14:48:15 -0700 Subject: Use cfg_if to branch code in WaitStatus decode --- src/sys/wait.rs | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'src/sys') diff --git a/src/sys/wait.rs b/src/sys/wait.rs index c3ae815f..7e21339d 100644 --- a/src/sys/wait.rs +++ b/src/sys/wait.rs @@ -191,13 +191,23 @@ fn decode(pid : pid_t, status: i32) -> WaitStatus { } else if status::signaled(status) { WaitStatus::Signaled(pid, status::term_signal(status), status::dumped_core(status)) } else if status::stopped(status) { - #[cfg(any(target_os = "linux", target_os = "android"))] { - let status_additional = status::stop_additional(status); - if status_additional != 0 { - return WaitStatus::PtraceEvent(pid, status::stop_signal(status), status::stop_additional(status)) + cfg_if! { + if #[cfg(any(target_os = "linux", target_os = "android"))] { + fn decode_stopped(pid: pid_t, status: i32) -> WaitStatus { + let status_additional = status::stop_additional(status); + if status_additional == 0 { + WaitStatus::Stopped(pid, status::stop_signal(status)) + } else { + WaitStatus::PtraceEvent(pid, status::stop_signal(status), status::stop_additional(status)) + } + } + } else { + fn decode_stopped(pid: pid_t, status: i32) -> WaitStatus { + WaitStatus::Stopped(pid, status::stop_signal(status)) + } } } - WaitStatus::Stopped(pid, status::stop_signal(status)) + decode_stopped(pid, status) } else { assert!(status::continued(status)); WaitStatus::Continued(pid) -- cgit v1.2.3