summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-07 08:31:53 +0000
committerbors <bors@rust-lang.org>2018-12-07 08:31:53 +0000
commitf5fa41603d1a6ca141ee1cb107ca816c7892a25b (patch)
tree5f7d0d64a0302ac6444806dcc26ca3e1a5564bfa
parent7ada017b53ab7cdfcb30b0724a3579c7373a7927 (diff)
parent7d65de6b61acc6897f09f756652db9d130fa10f8 (diff)
downloadrust-libc-f5fa41603d1a6ca141ee1cb107ca816c7892a25b.tar.gz
Auto merge of #1158 - strake:TIMER_ABSTIME, r=gnzlbg
define `TIMER_ABSTIME` on BSD
-rw-r--r--src/unix/bsd/freebsdlike/mod.rs2
-rw-r--r--src/unix/bsd/netbsdlike/mod.rs2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/unix/bsd/freebsdlike/mod.rs b/src/unix/bsd/freebsdlike/mod.rs
index 30228640d4..cb3dba4004 100644
--- a/src/unix/bsd/freebsdlike/mod.rs
+++ b/src/unix/bsd/freebsdlike/mod.rs
@@ -1017,6 +1017,8 @@ pub const SF_IMMUTABLE: ::c_ulong = 0x00020000;
pub const SF_APPEND: ::c_ulong = 0x00040000;
pub const SF_NOUNLINK: ::c_ulong = 0x00100000;
+pub const TIMER_ABSTIME: ::c_int = 1;
+
f! {
pub fn WIFCONTINUED(status: ::c_int) -> bool {
status == 0x13
diff --git a/src/unix/bsd/netbsdlike/mod.rs b/src/unix/bsd/netbsdlike/mod.rs
index 468d3fdd25..bfd541d8a0 100644
--- a/src/unix/bsd/netbsdlike/mod.rs
+++ b/src/unix/bsd/netbsdlike/mod.rs
@@ -589,6 +589,8 @@ pub const SF_ARCHIVED: ::c_ulong = 0x00010000;
pub const SF_IMMUTABLE: ::c_ulong = 0x00020000;
pub const SF_APPEND: ::c_ulong = 0x00040000;
+pub const TIMER_ABSTIME: ::c_int = 1;
+
f! {
pub fn WSTOPSIG(status: ::c_int) -> ::c_int {
status >> 8