diff options
| author | bors <bors@rust-lang.org> | 2023-01-20 12:58:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-20 12:58:13 +0000 |
| commit | 04a41f889f563b2384c63c990b5423d201d62ebd (patch) | |
| tree | 9d9e675e350653f151e0e956cc568d863ef6cd7d /library/std/src | |
| parent | 56ee85274e5a3a4dda92f3bf73d1664c74ff9c15 (diff) | |
| parent | c42fad8ff3b912719e5cbedc6756c6d1f27f8db3 (diff) | |
| download | rust-04a41f889f563b2384c63c990b5423d201d62ebd.tar.gz rust-04a41f889f563b2384c63c990b5423d201d62ebd.zip | |
Auto merge of #107105 - matthiaskrgr:rollup-rkz9t7r, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #106783 (Recover labels written as identifiers) - #106973 (Don't treat closures from other crates as local) - #106979 (Document how to get the type of a default associated type) - #107053 (signal update string representation for haiku.) - #107058 (Recognise double-equals homoglyph) - #107067 (Custom MIR: Support storage statements) - #107076 (Added const-generic ui test case for issue #106419) - #107091 (Fix broken format strings in `infer.ftl`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/sys/unix/process/process_unix.rs | 2 |
1 files changed, 2 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 c2c4aa1c9df..3bc17b7754d 100644 --- a/library/std/src/sys/unix/process/process_unix.rs +++ b/library/std/src/sys/unix/process/process_unix.rs @@ -746,6 +746,8 @@ fn signal_string(signal: i32) -> &'static str { libc::SIGWINCH => " (SIGWINCH)", #[cfg(not(target_os = "haiku"))] libc::SIGIO => " (SIGIO)", + #[cfg(target_os = "haiku")] + libc::SIGPOLL => " (SIGPOLL)", libc::SIGSYS => " (SIGSYS)", // For information on Linux signals, run `man 7 signal` #[cfg(all( |