diff options
| author | bors <bors@rust-lang.org> | 2016-06-15 14:01:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 14:01:42 -0700 |
| commit | f73f5c6c4060e474ccd76167d20ebadb63b0f52a (patch) | |
| tree | d640b9bf685cc75704f451fab6f425ef3153e921 | |
| parent | ee6613d5bce91b089859cf736b810a525c125b27 (diff) | |
| parent | ee3e49f8c5385fc5427f8c2ded44b8e042e7e1e3 (diff) | |
| download | rust-libc-f73f5c6c4060e474ccd76167d20ebadb63b0f52a.tar.gz | |
Auto merge of #318 - nikklassen:master, r=alexcrichton
Add missing constants for wait family
Fixes #315
| -rw-r--r-- | src/unix/bsd/mod.rs | 3 | ||||
| -rw-r--r-- | src/unix/notbsd/mod.rs | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/unix/bsd/mod.rs b/src/unix/bsd/mod.rs index 214edebd30..f9af6738b2 100644 --- a/src/unix/bsd/mod.rs +++ b/src/unix/bsd/mod.rs @@ -285,7 +285,8 @@ pub const FLUSHO: ::tcflag_t = 0x00800000; pub const PENDIN: ::tcflag_t = 0x20000000; pub const NOFLSH: ::tcflag_t = 0x80000000; -pub const WNOHANG: ::c_int = 1; +pub const WNOHANG: ::c_int = 0x00000001; +pub const WUNTRACED: ::c_int = 0x00000002; pub const RTLD_NOW: ::c_int = 0x2; pub const RTLD_DEFAULT: *mut ::c_void = -2isize as *mut ::c_void; diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs index 304bba005f..8119beea00 100644 --- a/src/unix/notbsd/mod.rs +++ b/src/unix/notbsd/mod.rs @@ -627,7 +627,16 @@ pub const CLONE_NEWPID: ::c_int = 0x20000000; pub const CLONE_NEWNET: ::c_int = 0x40000000; pub const CLONE_IO: ::c_int = 0x80000000; -pub const WNOHANG: ::c_int = 1; +pub const WNOHANG: ::c_int = 0x00000001; +pub const WUNTRACED: ::c_int = 0x00000002; +pub const WSTOPPED: ::c_int = WUNTRACED; +pub const WEXITED: ::c_int = 0x00000004; +pub const WCONTINUED: ::c_int = 0x00000008; +pub const WNOWAIT: ::c_int = 0x01000000; + +pub const __WNOTHREAD: ::c_int = 0x20000000; +pub const __WALL: ::c_int = 0x40000000; +pub const __WCLONE: ::c_int = 0x80000000; pub const SPLICE_F_MOVE: ::c_uint = 0x01; pub const SPLICE_F_NONBLOCK: ::c_uint = 0x02; |