Auto merge of #37055 - kali:master, r=alexcrichton

use MSG_NOSIGNAL on all relevant platforms followup #36824
rust-lang · Oct 9, 2016 · a7bfb1a · a7bfb1a
2 parents 9d4d0da + 14f9cbd
commit a7bfb1a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/src/liblibc b/src/liblibc
diff --git a/src/libstd/sys/common/net.rs b/src/libstd/sys/common/net.rs
@@ -42,10 +42,16 @@ use sys::net::netc::IPV6_LEAVE_GROUP as IPV6_DROP_MEMBERSHIP;
               target_os = "solaris", target_os = "haiku")))]
 use sys::net::netc::IPV6_DROP_MEMBERSHIP;
 
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "android",
+          target_os = "dragonfly", target_os = "freebsd",
+          target_os = "openbsd", target_os = "netbsd",
+          target_os = "haiku", target_os = "bitrig"))]
 use libc::MSG_NOSIGNAL;
-#[cfg(not(target_os = "linux"))]
-const MSG_NOSIGNAL: c_int = 0x0; // unused dummy value
+#[cfg(not(any(target_os = "linux", target_os = "android",
+              target_os = "dragonfly", target_os = "freebsd",
+              target_os = "openbsd", target_os = "netbsd",
+              target_os = "haiku", target_os = "bitrig")))]
+const MSG_NOSIGNAL: c_int = 0x0;
 
 ////////////////////////////////////////////////////////////////////////////////
 // sockaddr and misc bindings

diff --git a/src/libstd/sys/unix/ext/net.rs b/src/libstd/sys/unix/ext/net.rs
@@ -28,10 +28,16 @@ use sys::cvt;
 use sys::net::Socket;
 use sys_common::{AsInner, FromInner, IntoInner};
 
-#[cfg(target_os = "linux")]
+#[cfg(any(target_os = "linux", target_os = "android",
+          target_os = "dragonfly", target_os = "freebsd",
+          target_os = "openbsd", target_os = "netbsd",
+          target_os = "haiku", target_os = "bitrig"))]
 use libc::MSG_NOSIGNAL;
-#[cfg(not(target_os = "linux"))]
-const MSG_NOSIGNAL: libc::c_int = 0x0; // unused dummy value
+#[cfg(not(any(target_os = "linux", target_os = "android",
+              target_os = "dragonfly", target_os = "freebsd",
+              target_os = "openbsd", target_os = "netbsd",
+              target_os = "haiku", target_os = "bitrig")))]
+const MSG_NOSIGNAL: libc::c_int = 0x0;
 
 fn sun_path_offset() -> usize {
     unsafe {