diff options
| author | bors <bors@rust-lang.org> | 2022-06-07 11:08:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-07 11:08:58 +0000 |
| commit | 7fe2c4b00dfbc33643e1af4b293eb057306a8339 (patch) | |
| tree | 89cb7f71b608fa16f00b3efd70c4afbefd51280a /library/std/src/sys | |
| parent | 91cacb3faf987805675e39aca41859ec1fcabef3 (diff) | |
| parent | 95266530d5b97a51b4ad110733fa276f85c27b43 (diff) | |
| download | rust-7fe2c4b00dfbc33643e1af4b293eb057306a8339.tar.gz rust-7fe2c4b00dfbc33643e1af4b293eb057306a8339.zip | |
Auto merge of #97825 - Dylan-DPC:rollup-ya51k1k, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #97058 (Various refactors to the incr comp workproduct handling) - #97301 (Allow unstable items to be re-exported unstably without requiring the feature be enabled) - #97738 (Fix ICEs from zsts within unsized types with non-zero offsets) - #97771 (Remove SIGIO reference on Haiku) - #97808 (Add some unstable target features for the wasm target codegen) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/unix/process/process_unix.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/library/std/src/sys/unix/process/process_unix.rs b/library/std/src/sys/unix/process/process_unix.rs index ef29aa3c890..75bb92437fd 100644 --- a/library/std/src/sys/unix/process/process_unix.rs +++ b/library/std/src/sys/unix/process/process_unix.rs @@ -730,6 +730,7 @@ fn signal_string(signal: i32) -> &'static str { libc::SIGVTALRM => " (SIGVTALRM)", libc::SIGPROF => " (SIGPROF)", libc::SIGWINCH => " (SIGWINCH)", + #[cfg(not(target_os = "haiku"))] libc::SIGIO => " (SIGIO)", libc::SIGSYS => " (SIGSYS)", // For information on Linux signals, run `man 7 signal` |