diff options
| author | Stefan Plantikow <stefan.plantikow@googlemail.com> | 2012-01-05 00:11:25 +0100 |
|---|---|---|
| committer | Stefan Plantikow <stefan.plantikow@googlemail.com> | 2012-01-05 02:07:12 +0100 |
| commit | 6284190ef9918e05cb9147a2a81100ddcb06fea8 (patch) | |
| tree | e5e8075a4de03db9c4efee2b6d994343a674b3b5 /src/libstd/run_program.rs | |
| parent | 16405386f0a843167e234d8d54855a537b0f261d (diff) | |
| parent | 3971b520bcdd556ff78120c77ffd13785e1c3695 (diff) | |
| download | rust-6284190ef9918e05cb9147a2a81100ddcb06fea8.tar.gz rust-6284190ef9918e05cb9147a2a81100ddcb06fea8.zip | |
Merge branch 'master' into kmath
Conflicts: src/libcore/cmath.rs
Diffstat (limited to 'src/libstd/run_program.rs')
| -rw-r--r-- | src/libstd/run_program.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstd/run_program.rs b/src/libstd/run_program.rs index 55163696579..11bc15d578f 100644 --- a/src/libstd/run_program.rs +++ b/src/libstd/run_program.rs @@ -266,6 +266,7 @@ fn waitpid(pid: pid_t) -> int { #[cfg(target_os = "linux")] #[cfg(target_os = "macos")] + #[cfg(target_os = "freebsd")] fn waitpid_os(pid: pid_t) -> int { #[cfg(target_os = "linux")] fn WIFEXITED(status: i32) -> bool { @@ -273,6 +274,7 @@ fn waitpid(pid: pid_t) -> int { } #[cfg(target_os = "macos")] + #[cfg(target_os = "freebsd")] fn WIFEXITED(status: i32) -> bool { (status & 0x7fi32) == 0i32 } @@ -283,6 +285,7 @@ fn waitpid(pid: pid_t) -> int { } #[cfg(target_os = "macos")] + #[cfg(target_os = "freebsd")] fn WEXITSTATUS(status: i32) -> i32 { status >> 8i32 } |