diff options
| author | bors <bors@rust-lang.org> | 2022-10-18 23:40:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-18 23:40:30 +0000 |
| commit | 0488a83dc9aba7ec0643ea45d85cc722891e8cc2 (patch) | |
| tree | 3128f6e59d646f09e493d9e40371196abc23c6e3 | |
| parent | e96f3abac82baa7a717064e67fbb2e8650c584a4 (diff) | |
| parent | 35e3a431c379934afaec58ffb0d85b1554051ff9 (diff) | |
| download | rust-libc-0488a83dc9aba7ec0643ea45d85cc722891e8cc2.tar.gz | |
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
| -rw-r--r-- | libc-test/semver/macos-aarch64.txt | 3 | ||||
| -rw-r--r-- | libc-test/semver/macos.txt | 4 | ||||
| -rw-r--r-- | src/unix/bsd/apple/b64/aarch64/mod.rs | 2 | ||||
| -rw-r--r-- | src/unix/bsd/apple/mod.rs | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/libc-test/semver/macos-aarch64.txt b/libc-test/semver/macos-aarch64.txt index 3de7734f38..0dd36ae6a6 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/libc-test/semver/macos.txt b/libc-test/semver/macos.txt index 1babb4a5eb..048c8a1203 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/b64/aarch64/mod.rs b/src/unix/bsd/apple/b64/aarch64/mod.rs index 67f0f7032e..79e9ac842f 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; diff --git a/src/unix/bsd/apple/mod.rs b/src/unix/bsd/apple/mod.rs index ed30286953..8a7e2f1f09 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; |