Auto merge of #2968 - name1e5s:macos_clocks, r=JohnTitor

add missing clockid_t on macOS See https://github.com/apple-open-source-mirror/Libc/blob/master/include/time.h#L205
rust-lang · Oct 18, 2022 · 0488a83 · 0488a83
2 parents e96f3ab + 35e3a43
commit 0488a83
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git 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
+__darwin_arm_thread_state64
diff --git 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/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;

diff --git 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;