From de1de5a0786f2babbec28464bc7d01dac1bac4a8 Mon Sep 17 00:00:00 2001 From: "yuhaixin.hx" Date: Tue, 18 Oct 2022 10:36:39 +0800 Subject: [PATCH 1/2] add missing clockid_t on macOS --- libc-test/semver/macos.txt | 4 ++++ src/unix/bsd/apple/mod.rs | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libc-test/semver/macos.txt b/libc-test/semver/macos.txt index 1babb4a5eb99b..048c8a120329b 100644 --- a/libc-test/semver/macos.txt +++ b/libc-test/semver/macos.txt @@ -1,3 +1,7 @@ +CLOCK_MONOTONIC_RAW +CLOCK_MONOTONIC_RAW_APPROX +CLOCK_UPTIME_RAW +CLOCK_UPTIME_RAW_APPROX clock_settime memmem task_set_info diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs index ed30286953516..8a7e2f1f09e01 100644 --- a/src/unix/bsd/apple/mod.rs +++ b/src/unix/bsd/apple/mod.rs @@ -2694,7 +2694,11 @@ pub const ABMON_11: ::nl_item = 43; pub const ABMON_12: ::nl_item = 44; pub const CLOCK_REALTIME: ::clockid_t = 0; +pub const CLOCK_MONOTONIC_RAW: ::clockid_t = 4; +pub const CLOCK_MONOTONIC_RAW_APPROX: ::clockid_t = 5; pub const CLOCK_MONOTONIC: ::clockid_t = 6; +pub const CLOCK_UPTIME_RAW: ::clockid_t = 8; +pub const CLOCK_UPTIME_RAW_APPROX: ::clockid_t = 9; pub const CLOCK_PROCESS_CPUTIME_ID: ::clockid_t = 12; pub const CLOCK_THREAD_CPUTIME_ID: ::clockid_t = 16; From 35e3a431c379934afaec58ffb0d85b1554051ff9 Mon Sep 17 00:00:00 2001 From: name1e5s Date: Tue, 18 Oct 2022 22:59:47 +0800 Subject: [PATCH 2/2] remove redunant definition of CLOCK_UPTIME_RAW --- libc-test/semver/macos-aarch64.txt | 3 +-- src/unix/bsd/apple/b64/aarch64/mod.rs | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libc-test/semver/macos-aarch64.txt b/libc-test/semver/macos-aarch64.txt index 3de7734f380ed..0dd36ae6a60c8 100644 --- a/libc-test/semver/macos-aarch64.txt +++ b/libc-test/semver/macos-aarch64.txt @@ -1,4 +1,3 @@ __darwin_arm_exception_state64 __darwin_arm_neon_state64 -__darwin_arm_thread_state64 -CLOCK_UPTIME_RAW \ No newline at end of file +__darwin_arm_thread_state64 \ No newline at end of file diff --git a/src/unix/bsd/apple/b64/aarch64/mod.rs b/src/unix/bsd/apple/b64/aarch64/mod.rs index 67f0f7032e9c0..79e9ac842f9ca 100644 --- a/src/unix/bsd/apple/b64/aarch64/mod.rs +++ b/src/unix/bsd/apple/b64/aarch64/mod.rs @@ -6,8 +6,6 @@ s! { } } -pub const CLOCK_UPTIME_RAW: ::clockid_t = 8; - cfg_if! { if #[cfg(libc_align)] { mod align;