summaryrefslogtreecommitdiff
path: root/src/unix/linux_like
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2020-03-08 20:21:01 +0900
committerYuki Okushi <huyuumi.dev@gmail.com>2020-03-08 20:21:01 +0900
commit9b31f772bbe6121ce24e5dabaa71b87540464052 (patch)
tree52dc964fc61d0be22b9e7a8be5ec0e5b1051b1cc /src/unix/linux_like
parent58465589bf71ff2b1d916935e9f60dc54ff24376 (diff)
downloadrust-libc-9b31f772bbe6121ce24e5dabaa71b87540464052.tar.gz
Add `CLOCK_TAI` to linux_like/mod.rs
Diffstat (limited to 'src/unix/linux_like')
-rw-r--r--src/unix/linux_like/emscripten/mod.rs3
-rw-r--r--src/unix/linux_like/linux/musl/mod.rs3
-rw-r--r--src/unix/linux_like/mod.rs5
3 files changed, 1 insertions, 10 deletions
diff --git a/src/unix/linux_like/emscripten/mod.rs b/src/unix/linux_like/emscripten/mod.rs
index 630cb3afd1..9ede79b7b4 100644
--- a/src/unix/linux_like/emscripten/mod.rs
+++ b/src/unix/linux_like/emscripten/mod.rs
@@ -1287,10 +1287,7 @@ pub const TIOCINQ: ::c_int = ::FIONREAD;
pub const RTLD_GLOBAL: ::c_int = 0x100;
pub const RTLD_NOLOAD: ::c_int = 0x4;
-// FIXME(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
-// kernel 3.10). See also linux_like/mod.rs
pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
-pub const CLOCK_TAI: ::clockid_t = 11;
pub const MCL_CURRENT: ::c_int = 0x0001;
pub const MCL_FUTURE: ::c_int = 0x0002;
diff --git a/src/unix/linux_like/linux/musl/mod.rs b/src/unix/linux_like/linux/musl/mod.rs
index 1d0e900f61..73c562c30e 100644
--- a/src/unix/linux_like/linux/musl/mod.rs
+++ b/src/unix/linux_like/linux/musl/mod.rs
@@ -328,10 +328,7 @@ pub const TCSAFLUSH: ::c_int = 2;
pub const RTLD_GLOBAL: ::c_int = 0x100;
pub const RTLD_NOLOAD: ::c_int = 0x4;
-// FIXME(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
-// kernel 3.10). See also linux_like/mod.rs
pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
-pub const CLOCK_TAI: ::clockid_t = 11;
pub const B0: ::speed_t = 0o000000;
pub const B50: ::speed_t = 0o000001;
diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs
index efc74a3568..a867ed4b08 100644
--- a/src/unix/linux_like/mod.rs
+++ b/src/unix/linux_like/mod.rs
@@ -499,10 +499,7 @@ pub const CLOCK_MONOTONIC_COARSE: ::clockid_t = 6;
pub const CLOCK_BOOTTIME: ::clockid_t = 7;
pub const CLOCK_REALTIME_ALARM: ::clockid_t = 8;
pub const CLOCK_BOOTTIME_ALARM: ::clockid_t = 9;
-// FIXME(#247) Someday our Travis shall have glibc 2.21 (released in Sep
-// 2014.) See also musl/mod.rs
-// pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
-// pub const CLOCK_TAI: ::clockid_t = 11;
+pub const CLOCK_TAI: ::clockid_t = 11;
pub const TIMER_ABSTIME: ::c_int = 1;
pub const RUSAGE_SELF: ::c_int = 0;