diff options
| author | bors <bors@rust-lang.org> | 2017-04-06 01:00:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-06 01:00:15 +0000 |
| commit | 6cd15a0e8fecce04fd99b77b25099bf374bb0f56 (patch) | |
| tree | 47828ad744694e7cfeed50af05ee9d6c8f1b3779 /src/libstd/sys | |
| parent | 91ae22a012fae7fa7589b1bba77bf4579708ee33 (diff) | |
| parent | d8b61091f619be7c4605e56561eba58a3618447b (diff) | |
| download | rust-6cd15a0e8fecce04fd99b77b25099bf374bb0f56.tar.gz rust-6cd15a0e8fecce04fd99b77b25099bf374bb0f56.zip | |
Auto merge of #41098 - arielb1:rollup, r=arielb1
Rollup of 12 pull requests - Successful merges: #40479, #40561, #40709, #40815, #40909, #40927, #40943, #41015, #41028, #41052, #41054, #41065 - Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/mod.rs b/src/libstd/sys/unix/mod.rs index c57751a01d7..854d380d128 100644 --- a/src/libstd/sys/unix/mod.rs +++ b/src/libstd/sys/unix/mod.rs @@ -92,7 +92,7 @@ pub fn init() { #[cfg(not(any(target_os = "nacl", target_os = "emscripten", target_os="fuchsia")))] unsafe fn reset_sigpipe() { - assert!(signal(libc::SIGPIPE, libc::SIG_IGN) != !0); + assert!(signal(libc::SIGPIPE, libc::SIG_IGN) != libc::SIG_ERR); } #[cfg(any(target_os = "nacl", target_os = "emscripten", target_os="fuchsia"))] unsafe fn reset_sigpipe() {} |