user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

just use libc::clockid_t

Browse source
This commit is contained in:
Cameron 2022-11-13 12:33:21 -08:00
parent 5008a317ce
commit 015ab659c2
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
library/std/src/sys/unix/time.rs
View file

@ -290,9 +290,9 @@ mod inner {
impl Instant {
pub fn now() -> Instant {
#[cfg(target_os = "macos")]
const clock_id: clock_t = libc::CLOCK_UPTIME_RAW;
const clock_id: libc::clockid_t = libc::CLOCK_UPTIME_RAW;
#[cfg(not(target_os = "macos"))]
const clock_id: clock_t = libc::CLOCK_MONOTONIC;
const clock_id: libc::clockid_t = libc::CLOCK_MONOTONIC;
Instant { t: Timespec::now(clock_id) }
}
@ -324,13 +324,8 @@ mod inner {
}
}
#[cfg(not(any(target_os = "dragonfly", target_os = "espidf", target_os = "horizon")))]
pub type clock_t = libc::c_int;
#[cfg(any(target_os = "dragonfly", target_os = "espidf", target_os = "horizon"))]
pub type clock_t = libc::c_ulong;
impl Timespec {
pub fn now(clock: clock_t) -> Timespec {
pub fn now(clock: libc::clockid_t) -> Timespec {
// Try to use 64-bit time in preparation for Y2038.
#[cfg(all(target_os = "linux", target_env = "gnu", target_pointer_width = "32"))]
{