Skip to content

Commit 9b31f77

Browse files
committed
Add CLOCK_TAI to linux_like/mod.rs
1 parent 5846558 commit 9b31f77

File tree

5 files changed

+4
-21
lines changed

5 files changed

+4
-21
lines changed

src/fuchsia/mod.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,10 +1433,8 @@ pub const CLOCK_MONOTONIC_COARSE: ::clockid_t = 6;
14331433
pub const CLOCK_BOOTTIME: ::clockid_t = 7;
14341434
pub const CLOCK_REALTIME_ALARM: ::clockid_t = 8;
14351435
pub const CLOCK_BOOTTIME_ALARM: ::clockid_t = 9;
1436-
// FIXME(#247) Someday our Travis shall have glibc 2.21 (released in Sep
1437-
// 2014.) See also musl/mod.rs
1438-
// pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
1439-
// pub const CLOCK_TAI: ::clockid_t = 11;
1436+
pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
1437+
pub const CLOCK_TAI: ::clockid_t = 11;
14401438
pub const TIMER_ABSTIME: ::c_int = 1;
14411439

14421440
pub const RLIMIT_CPU: ::c_int = 0;
@@ -2773,11 +2771,6 @@ pub const TIOCINQ: ::c_int = ::FIONREAD;
27732771
pub const RTLD_GLOBAL: ::c_int = 0x100;
27742772
pub const RTLD_NOLOAD: ::c_int = 0x4;
27752773

2776-
// FIXME(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
2777-
// kernel 3.10). See also notbsd/mod.rs
2778-
pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
2779-
pub const CLOCK_TAI: ::clockid_t = 11;
2780-
27812774
pub const MCL_CURRENT: ::c_int = 0x0001;
27822775
pub const MCL_FUTURE: ::c_int = 0x0002;
27832776

src/unix/linux_like/emscripten/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1287,10 +1287,7 @@ pub const TIOCINQ: ::c_int = ::FIONREAD;
12871287
pub const RTLD_GLOBAL: ::c_int = 0x100;
12881288
pub const RTLD_NOLOAD: ::c_int = 0x4;
12891289

1290-
// FIXME(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
1291-
// kernel 3.10). See also linux_like/mod.rs
12921290
pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
1293-
pub const CLOCK_TAI: ::clockid_t = 11;
12941291

12951292
pub const MCL_CURRENT: ::c_int = 0x0001;
12961293
pub const MCL_FUTURE: ::c_int = 0x0002;

src/unix/linux_like/linux/musl/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,7 @@ pub const TCSAFLUSH: ::c_int = 2;
328328
pub const RTLD_GLOBAL: ::c_int = 0x100;
329329
pub const RTLD_NOLOAD: ::c_int = 0x4;
330330

331-
// FIXME(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
332-
// kernel 3.10). See also linux_like/mod.rs
333331
pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
334-
pub const CLOCK_TAI: ::clockid_t = 11;
335332

336333
pub const B0: ::speed_t = 0o000000;
337334
pub const B50: ::speed_t = 0o000001;

src/unix/linux_like/mod.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -499,10 +499,7 @@ pub const CLOCK_MONOTONIC_COARSE: ::clockid_t = 6;
499499
pub const CLOCK_BOOTTIME: ::clockid_t = 7;
500500
pub const CLOCK_REALTIME_ALARM: ::clockid_t = 8;
501501
pub const CLOCK_BOOTTIME_ALARM: ::clockid_t = 9;
502-
// FIXME(#247) Someday our Travis shall have glibc 2.21 (released in Sep
503-
// 2014.) See also musl/mod.rs
504-
// pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
505-
// pub const CLOCK_TAI: ::clockid_t = 11;
502+
pub const CLOCK_TAI: ::clockid_t = 11;
506503
pub const TIMER_ABSTIME: ::c_int = 1;
507504

508505
pub const RUSAGE_SELF: ::c_int = 0;

src/unix/uclibc/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -512,8 +512,7 @@ pub const CLOCK_REALTIME: ::clockid_t = 0;
512512
pub const CLOCK_MONOTONIC: ::clockid_t = 1;
513513
pub const CLOCK_PROCESS_CPUTIME_ID: ::clockid_t = 2;
514514
pub const CLOCK_THREAD_CPUTIME_ID: ::clockid_t = 3;
515-
// FIXME(#247) Someday our Travis shall have glibc 2.21 (released in Sep
516-
// 2014.) See also musl/mod.rs
515+
// FIXME: Add these constants once uclibc gets them.
517516
// pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
518517
// pub const CLOCK_TAI: ::clockid_t = 11;
519518
pub const TIMER_ABSTIME: ::c_int = 1;

0 commit comments

Comments
 (0)