From efb23db79a5cc16770a7c3d5cef7059d868dea8f Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 9 Feb 2016 15:13:33 -0800
Subject: [PATCH] std: Use macros from libc instead of locally

Helps cut down on #[cfg]!
---
 src/libstd/sys/unix/process.rs | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/libstd/sys/unix/process.rs b/src/libstd/sys/unix/process.rs
index 60785f376423f..9e12b2f116cc3 100644
--- a/src/libstd/sys/unix/process.rs
+++ b/src/libstd/sys/unix/process.rs
@@ -519,30 +519,9 @@ impl fmt::Debug for Command {
 #[derive(PartialEq, Eq, Clone, Copy, Debug)]
 pub struct ExitStatus(c_int);
 
-#[cfg(any(target_os = "linux", target_os = "android",
-          target_os = "nacl"))]
-mod status_imp {
-    pub fn WIFEXITED(status: i32) -> bool { (status & 0xff) == 0 }
-    pub fn WEXITSTATUS(status: i32) -> i32 { (status >> 8) & 0xff }
-    pub fn WTERMSIG(status: i32) -> i32 { status & 0x7f }
-}
-
-#[cfg(any(target_os = "macos",
-          target_os = "ios",
-          target_os = "freebsd",
-          target_os = "dragonfly",
-          target_os = "bitrig",
-          target_os = "netbsd",
-          target_os = "openbsd"))]
-mod status_imp {
-    pub fn WIFEXITED(status: i32) -> bool { (status & 0x7f) == 0 }
-    pub fn WEXITSTATUS(status: i32) -> i32 { status >> 8 }
-    pub fn WTERMSIG(status: i32) -> i32 { status & 0o177 }
-}
-
 impl ExitStatus {
     fn exited(&self) -> bool {
-        status_imp::WIFEXITED(self.0)
+        unsafe { libc::WIFEXITED(self.0) }
     }
 
     pub fn success(&self) -> bool {
@@ -551,7 +530,7 @@ impl ExitStatus {
 
     pub fn code(&self) -> Option<i32> {
         if self.exited() {
-            Some(status_imp::WEXITSTATUS(self.0))
+            Some(unsafe { libc::WEXITSTATUS(self.0) })
         } else {
             None
         }
@@ -559,7 +538,7 @@ impl ExitStatus {
 
     pub fn signal(&self) -> Option<i32> {
         if !self.exited() {
-            Some(status_imp::WTERMSIG(self.0))
+            Some(unsafe { libc::WTERMSIG(self.0) })
         } else {
             None
         }