Skip to content

Commit 567e61d

Browse files
authored
Rollup merge of #67977 - Wind-River:master_2020, r=alexcrichton
Updates for VxWorks r? @alexcrichton
2 parents efce4ca + cec957e commit 567e61d

File tree

2 files changed

+2
-66
lines changed

2 files changed

+2
-66
lines changed

src/libstd/sys/vxworks/mod.rs

+2-10
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,10 @@ pub use crate::sys_common::os_str_bytes as os_str;
3636

3737
#[cfg(not(test))]
3838
pub fn init() {
39-
// By default, some platforms will send a *signal* when an EPIPE error
40-
// would otherwise be delivered. This runtime doesn't install a SIGPIPE
41-
// handler, causing it to kill the program, which isn't exactly what we
42-
// want!
43-
//
44-
// Hence, we set SIGPIPE to ignore when the program starts up in order
45-
// to prevent this problem.
39+
// ignore SIGPIPE
4640
unsafe {
47-
reset_sigpipe();
41+
assert!(signal(libc::SIGPIPE, libc::SIG_IGN) != libc::SIG_ERR);
4842
}
49-
50-
unsafe fn reset_sigpipe() {}
5143
}
5244

5345
pub use libc::signal;

src/libstd/sys/vxworks/weak.rs

-56
This file was deleted.

0 commit comments

Comments
 (0)