Skip to content

Commit 75486a9

Browse files
committed
---
yaml --- r: 136043 b: refs/heads/master c: 67d83f3 h: refs/heads/master i: 136041: 1c8d33d 136039: ffde64b v: v3
1 parent a0bfece commit 75486a9

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: c586490715a35d3c9dae17de7f8907c2f73168d3
2+
refs/heads/master: 67d83f3bfc94298ebd7ffd65eefd9eeec884fd9c
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 749ff5e76a0d08837964e44c66654679a3a88bb8
55
refs/heads/try: ca87704735687dad44b26788c773df2d87b3b710

trunk/src/libnative/io/c_unix.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,9 @@ mod signal {
232232
pub static SA_SIGINFO: libc::c_int = 0x0040;
233233
pub static SIGCHLD: libc::c_int = 20;
234234

235-
#[cfg(target_os = "macos")]
236-
#[cfg(target_os = "ios")]
235+
#[cfg(any(target_os = "macos", target_os = "ios"))]
237236
pub type sigset_t = u32;
238-
#[cfg(target_os = "freebsd")]
239-
#[cfg(target_os = "dragonfly")]
237+
#[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
240238
#[repr(C)]
241239
pub struct sigset_t {
242240
bits: [u32, ..4],
@@ -254,8 +252,7 @@ mod signal {
254252
pub status: libc::c_int,
255253
}
256254

257-
#[cfg(target_os = "macos")]
258-
#[cfg(target_os = "ios")]
255+
#[cfg(any(target_os = "macos", target_os = "ios"))]
259256
#[repr(C)]
260257
pub struct sigaction {
261258
pub sa_handler: extern fn(libc::c_int),
@@ -264,8 +261,7 @@ mod signal {
264261
pub sa_flags: libc::c_int,
265262
}
266263

267-
#[cfg(target_os = "freebsd")]
268-
#[cfg(target_os = "dragonfly")]
264+
#[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
269265
#[repr(C)]
270266
pub struct sigaction {
271267
pub sa_handler: extern fn(libc::c_int),

0 commit comments

Comments
 (0)