diff options
| author | bors <bors@rust-lang.org> | 2014-10-05 17:02:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-10-05 17:02:11 +0000 |
| commit | 027d6b4d5301edb1595c23bd55bd893f53a726b7 (patch) | |
| tree | 24ba37d5ead5730dc35309bbfe345e1ee912ad7f | |
| parent | c586490715a35d3c9dae17de7f8907c2f73168d3 (diff) | |
| parent | 67d83f3bfc94298ebd7ffd65eefd9eeec884fd9c (diff) | |
| download | rust-027d6b4d5301edb1595c23bd55bd893f53a726b7.tar.gz rust-027d6b4d5301edb1595c23bd55bd893f53a726b7.zip | |
auto merge of #17799 : ebfe/rust/cfg_warn, r=alexcrichton
Probably fallen through the cracks in #17630.
| -rw-r--r-- | src/libnative/io/c_unix.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/libnative/io/c_unix.rs b/src/libnative/io/c_unix.rs index 2601d493443..a8ebcda3cdd 100644 --- a/src/libnative/io/c_unix.rs +++ b/src/libnative/io/c_unix.rs @@ -232,11 +232,9 @@ mod signal { pub static SA_SIGINFO: libc::c_int = 0x0040; pub static SIGCHLD: libc::c_int = 20; - #[cfg(target_os = "macos")] - #[cfg(target_os = "ios")] + #[cfg(any(target_os = "macos", target_os = "ios"))] pub type sigset_t = u32; - #[cfg(target_os = "freebsd")] - #[cfg(target_os = "dragonfly")] + #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] #[repr(C)] pub struct sigset_t { bits: [u32, ..4], @@ -254,8 +252,7 @@ mod signal { pub status: libc::c_int, } - #[cfg(target_os = "macos")] - #[cfg(target_os = "ios")] + #[cfg(any(target_os = "macos", target_os = "ios"))] #[repr(C)] pub struct sigaction { pub sa_handler: extern fn(libc::c_int), @@ -264,8 +261,7 @@ mod signal { pub sa_flags: libc::c_int, } - #[cfg(target_os = "freebsd")] - #[cfg(target_os = "dragonfly")] + #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] #[repr(C)] pub struct sigaction { pub sa_handler: extern fn(libc::c_int), |