diff options
| author | bors <bors@rust-lang.org> | 2016-03-11 11:00:34 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-03-11 11:00:34 -0800 |
| commit | ef979ef4d81d3bb1814f9434ba964c1010ae6f40 (patch) | |
| tree | 881b4f734862395eae7bc6a176db98f2bc1e1fb0 | |
| parent | 61ae4865b0ea8ebd2351f1ad58b7220b5810f1de (diff) | |
| parent | 378bb73bcc960da500dd89a431f29eaf1810ee56 (diff) | |
| download | rust-libc-ef979ef4d81d3bb1814f9434ba964c1010ae6f40.tar.gz | |
Auto merge of #222 - mneumann:dragonfly_clock_gettime, r=alexcrichton
Fix DragonFly: clock_gettime() expects CLOCK_* constants as ulong.
While there add all CLOCK_ constants as found on DragonFly.
| -rw-r--r-- | src/unix/bsd/freebsdlike/dragonfly/mod.rs | 15 | ||||
| -rw-r--r-- | src/unix/bsd/freebsdlike/freebsd/mod.rs | 3 | ||||
| -rw-r--r-- | src/unix/bsd/freebsdlike/mod.rs | 3 |
3 files changed, 18 insertions, 3 deletions
diff --git a/src/unix/bsd/freebsdlike/dragonfly/mod.rs b/src/unix/bsd/freebsdlike/dragonfly/mod.rs index 079f49576d..865244265f 100644 --- a/src/unix/bsd/freebsdlike/dragonfly/mod.rs +++ b/src/unix/bsd/freebsdlike/dragonfly/mod.rs @@ -96,6 +96,21 @@ pub const RLIM_NLIMITS: ::rlim_t = 12; pub const Q_GETQUOTA: ::c_int = 0x300; pub const Q_SETQUOTA: ::c_int = 0x400; +pub const CLOCK_REALTIME: ::c_ulong = 0; +pub const CLOCK_VIRTUAL: ::c_ulong = 1; +pub const CLOCK_PROF: ::c_ulong = 2; +pub const CLOCK_MONOTONIC: ::c_ulong = 4; +pub const CLOCK_UPTIME: ::c_ulong = 5; +pub const CLOCK_UPTIME_PRECISE: ::c_ulong = 7; +pub const CLOCK_UPTIME_FAST: ::c_ulong = 8; +pub const CLOCK_REALTIME_PRECISE: ::c_ulong = 9; +pub const CLOCK_REALTIME_FAST: ::c_ulong = 10; +pub const CLOCK_MONOTONIC_PRECISE: ::c_ulong = 11; +pub const CLOCK_MONOTONIC_FAST: ::c_ulong = 12; +pub const CLOCK_SECOND: ::c_ulong = 13; +pub const CLOCK_THREAD_CPUTIME_ID: ::c_ulong = 14; +pub const CLOCK_PROCESS_CPUTIME_ID: ::c_ulong = 15; + extern { pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int) -> ::c_int; diff --git a/src/unix/bsd/freebsdlike/freebsd/mod.rs b/src/unix/bsd/freebsdlike/freebsd/mod.rs index 171889e561..0d913c6d93 100644 --- a/src/unix/bsd/freebsdlike/freebsd/mod.rs +++ b/src/unix/bsd/freebsdlike/freebsd/mod.rs @@ -60,6 +60,9 @@ pub const POSIX_FADV_NOREUSE: ::c_int = 5; pub const MADV_PROTECT: ::c_int = 10; pub const RUSAGE_THREAD: ::c_int = 1; +pub const CLOCK_REALTIME: ::c_int = 0; +pub const CLOCK_MONOTONIC: ::c_int = 4; + extern { pub fn __error() -> *mut ::c_int; diff --git a/src/unix/bsd/freebsdlike/mod.rs b/src/unix/bsd/freebsdlike/mod.rs index 829ce6dbd9..1276a974e0 100644 --- a/src/unix/bsd/freebsdlike/mod.rs +++ b/src/unix/bsd/freebsdlike/mod.rs @@ -366,9 +366,6 @@ pub const _SC_XOPEN_XCU_VERSION: ::c_int = 117; pub const PTHREAD_CREATE_JOINABLE: ::c_int = 0; pub const PTHREAD_CREATE_DETACHED: ::c_int = 1; -pub const CLOCK_REALTIME: ::c_int = 0; -pub const CLOCK_MONOTONIC: ::c_int = 4; - pub const RLIMIT_CPU: ::c_int = 0; pub const RLIMIT_FSIZE: ::c_int = 1; pub const RLIMIT_DATA: ::c_int = 2; |