OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #67389 - reitermarkus:dummy-variable, r=shepmaster 

Remove `SO_NOSIGPIPE` dummy variable on platforms that don't use it.
This commit is contained in:
Mazdak Farrokhzad 2019-12-19 10:29:59 +01:00 committed by GitHub
parent 126c8adb33 58910255aa
commit 6d60606a17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libstd/sys/unix/net.rs
View File

@ -28,14 +28,6 @@ use libc::SOCK_CLOEXEC;
#[cfg(not(target_os = "linux"))]
const SOCK_CLOEXEC: c_int = 0;
// Another conditional constant for name resolution: Macos et iOS use
// SO_NOSIGPIPE as a setsockopt flag to disable SIGPIPE emission on socket.
// Other platforms do otherwise.
#[cfg(target_vendor = "apple")]
use libc::SO_NOSIGPIPE;
#[cfg(not(target_vendor = "apple"))]
const SO_NOSIGPIPE: c_int = 0;
pub struct Socket(FileDesc);
pub fn init() {}
@ -89,9 +81,12 @@ impl Socket {
let fd = FileDesc::new(fd);
fd.set_cloexec()?;
let socket = Socket(fd);
if cfg!(target_vendor = "apple") {
setsockopt(&socket, libc::SOL_SOCKET, SO_NOSIGPIPE, 1)?;
}
// macOS and iOS use `SO_NOSIGPIPE` as a `setsockopt`
// flag to disable `SIGPIPE` emission on socket.
#[cfg(target_vendor = "apple")]
setsockopt(&socket, libc::SOL_SOCKET, libc::SO_NOSIGPIPE, 1)?;
Ok(socket)
}
}

1
src/libstd/sys/vxworks/net.rs
View File

@ -19,7 +19,6 @@ pub extern crate libc as netc;
pub type wrlen_t = size_t;
const SOCK_CLOEXEC: c_int = 0;
const SO_NOSIGPIPE: c_int = 0;
pub struct Socket(FileDesc);