Skip to content

Commit 5a598d5

Browse files
authored
Fix more missing cfg(feature = "process"). (#932)
Fixes #930.
1 parent 9dcd60a commit 5a598d5

File tree

5 files changed

+23
-4
lines changed

5 files changed

+23
-4
lines changed

src/backend/linux_raw/c.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ pub(crate) use linux_raw_sys::general::epoll_event;
2929
not(feature = "use-explicitly-provided-auxv"),
3030
any(
3131
feature = "param",
32+
feature = "process",
3233
feature = "runtime",
3334
feature = "time",
3435
target_arch = "x86",

src/backend/linux_raw/conv.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ pub(super) fn socklen_t<'a, Num: ArgNumber>(i: socklen_t) -> ArgReg<'a, Num> {
303303
not(feature = "use-explicitly-provided-auxv"),
304304
any(
305305
feature = "param",
306+
feature = "process",
306307
feature = "runtime",
307308
feature = "time",
308309
target_arch = "x86",

src/backend/linux_raw/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ pub(crate) mod event;
3232
not(feature = "use-explicitly-provided-auxv"),
3333
any(
3434
feature = "param",
35+
feature = "process",
3536
feature = "runtime",
3637
feature = "time",
3738
target_arch = "x86",
@@ -52,6 +53,7 @@ pub(crate) mod mount; // for deprecated mount functions in "fs"
5253
pub(crate) mod net;
5354
#[cfg(any(
5455
feature = "param",
56+
feature = "process",
5557
feature = "runtime",
5658
feature = "time",
5759
target_arch = "x86",

src/backend/linux_raw/vdso_wrappers.rs

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,25 @@ use core::sync::atomic::Ordering::Relaxed;
2929
#[cfg(target_pointer_width = "32")]
3030
#[cfg(feature = "time")]
3131
use linux_raw_sys::general::timespec as __kernel_old_timespec;
32-
#[cfg(any(feature = "time", feature = "process"))]
32+
#[cfg(any(
33+
all(
34+
feature = "process",
35+
any(
36+
target_arch = "x86_64",
37+
target_arch = "x86",
38+
target_arch = "riscv64",
39+
target_arch = "powerpc64"
40+
)
41+
),
42+
feature = "time"
43+
))]
44+
use {super::c, super::conv::ret, core::mem::MaybeUninit};
45+
#[cfg(any(feature = "time"))]
3346
use {
34-
super::c,
35-
super::conv::{c_int, ret},
47+
super::conv::c_int,
3648
crate::clockid::{ClockId, DynamicClockId},
3749
crate::io,
3850
crate::timespec::Timespec,
39-
core::mem::MaybeUninit,
4051
linux_raw_sys::general::{__kernel_clockid_t, __kernel_timespec},
4152
};
4253

src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ pub(crate) mod mount;
305305
not(feature = "use-explicitly-provided-auxv"),
306306
any(
307307
feature = "param",
308+
feature = "process",
308309
feature = "runtime",
309310
feature = "time",
310311
target_arch = "x86",
@@ -322,6 +323,7 @@ pub(crate) mod fs;
322323
not(feature = "use-explicitly-provided-auxv"),
323324
any(
324325
feature = "param",
326+
feature = "process",
325327
feature = "runtime",
326328
feature = "time",
327329
target_arch = "x86",
@@ -353,6 +355,7 @@ mod signal;
353355
#[cfg(not(windows))]
354356
#[cfg(any(
355357
feature = "fs",
358+
feature = "process",
356359
feature = "runtime",
357360
feature = "thread",
358361
feature = "time",
@@ -362,6 +365,7 @@ mod signal;
362365
not(feature = "use-explicitly-provided-auxv"),
363366
any(
364367
feature = "param",
368+
feature = "process",
365369
feature = "runtime",
366370
feature = "time",
367371
target_arch = "x86",

0 commit comments

Comments
 (0)