diff options
| author | bors <bors@rust-lang.org> | 2022-03-19 02:16:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-19 02:16:00 +0000 |
| commit | 31535841701e0bf7ef33998024376f2cedd8b3e3 (patch) | |
| tree | e7324ba6fe7594fb039b2a4cd064ed457f43f57e /library/std/src/sys/unix/process/process_unix.rs | |
| parent | 9b701e7eaa08c2b2ef8c6e59b8b33436cb10aa45 (diff) | |
| parent | 30b4182fa7ff8718335771b80a7687acb86f498a (diff) | |
| download | rust-31535841701e0bf7ef33998024376f2cedd8b3e3.tar.gz rust-31535841701e0bf7ef33998024376f2cedd8b3e3.zip | |
Auto merge of #95101 - Dylan-DPC:rollup-r1f1v9t, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #92519 (Use verbatim paths for `process::Command` if necessary) - #92612 (Update stdlib for the l4re target) - #92663 (Implement `Write for Cursor<[u8; N]>`, plus `A: Allocator` cursor support) - #93263 (Consistently present absent stdio handles on Windows as NULL handles.) - #93692 (keyword_docs: document use of `in` with `pub` keyword) - #94984 (add `CStr` method that accepts any slice containing a nul-terminated string) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/unix/process/process_unix.rs')
| -rw-r--r-- | library/std/src/sys/unix/process/process_unix.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/library/std/src/sys/unix/process/process_unix.rs b/library/std/src/sys/unix/process/process_unix.rs index 9d2803b40c4..2a97a802a20 100644 --- a/library/std/src/sys/unix/process/process_unix.rs +++ b/library/std/src/sys/unix/process/process_unix.rs @@ -27,7 +27,10 @@ use crate::sys::weak::weak; use libc::RTP_ID as pid_t; #[cfg(not(target_os = "vxworks"))] -use libc::{c_int, gid_t, pid_t, uid_t}; +use libc::{c_int, pid_t}; + +#[cfg(not(any(target_os = "vxworks", target_os = "l4re")))] +use libc::{gid_t, uid_t}; //////////////////////////////////////////////////////////////////////////////// // Command |