diff options
| author | Alan Somers <asomers@gmail.com> | 2016-11-13 15:03:14 -0700 |
|---|---|---|
| committer | Alan Somers <asomers@gmail.com> | 2016-11-13 15:03:14 -0700 |
| commit | 804763c4e5fa2bf09570e9ad2fc09ef8d6fb6864 (patch) | |
| tree | 2363c60a68b1443c1a754f913d7c653c85ebe788 | |
| parent | e0ff0d61854b5dfcd58aec4d081c3a58618b5623 (diff) | |
| download | rust-libc-804763c4e5fa2bf09570e9ad2fc09ef8d6fb6864.tar.gz | |
Fix errors, mostly style, in PR #449
| -rw-r--r-- | src/unix/notbsd/android/mod.rs | 2 | ||||
| -rw-r--r-- | src/unix/notbsd/linux/mod.rs | 9 | ||||
| -rw-r--r-- | src/unix/notbsd/linux/other/mod.rs | 2 | ||||
| -rw-r--r-- | src/unix/notbsd/mod.rs | 11 |
4 files changed, 13 insertions, 11 deletions
diff --git a/src/unix/notbsd/android/mod.rs b/src/unix/notbsd/android/mod.rs index efc136817d..5816f7ffbe 100644 --- a/src/unix/notbsd/android/mod.rs +++ b/src/unix/notbsd/android/mod.rs @@ -641,6 +641,8 @@ pub const NLA_F_NESTED: ::c_int = 1 << 15; pub const NLA_F_NET_BYTEORDER: ::c_int = 1 << 14; pub const NLA_TYPE_MASK: ::c_int = !(NLA_F_NESTED | NLA_F_NET_BYTEORDER); +pub const SIGEV_THREAD_ID: ::c_int = 4; + f! { pub fn sigemptyset(set: *mut sigset_t) -> ::c_int { *set = 0; diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs index d477d09ea1..db619b26ca 100644 --- a/src/unix/notbsd/linux/mod.rs +++ b/src/unix/notbsd/linux/mod.rs @@ -542,6 +542,15 @@ pub const SYNC_FILE_RANGE_WAIT_AFTER: ::c_uint = 4; pub const EAI_SYSTEM: ::c_int = -11; +pub const AIO_CANCELED: ::c_int = 0; +pub const AIO_NOTCANCELED: ::c_int = 1; +pub const AIO_ALLDONE: ::c_int = 2; +pub const LIO_READ: ::c_int = 0; +pub const LIO_WRITE: ::c_int = 1; +pub const LIO_NOP: ::c_int = 2; +pub const LIO_WAIT: ::c_int = 0; +pub const LIO_NOWAIT: ::c_int = 1; + f! { pub fn CPU_ZERO(cpuset: &mut cpu_set_t) -> () { for slot in cpuset.bits.iter_mut() { diff --git a/src/unix/notbsd/linux/other/mod.rs b/src/unix/notbsd/linux/other/mod.rs index 97c28ea81c..4a8cdd79fb 100644 --- a/src/unix/notbsd/linux/other/mod.rs +++ b/src/unix/notbsd/linux/other/mod.rs @@ -345,6 +345,8 @@ pub const SIG_SETMASK: ::c_int = 2; pub const SIG_BLOCK: ::c_int = 0x000000; pub const SIG_UNBLOCK: ::c_int = 0x01; +pub const SIGEV_THREAD_ID: ::c_int = 4; + pub const POLLRDNORM: ::c_short = 0x040; pub const POLLWRNORM: ::c_short = 0x100; pub const POLLRDBAND: ::c_short = 0x080; diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs index f0fda2682e..03a2b44ae0 100644 --- a/src/unix/notbsd/mod.rs +++ b/src/unix/notbsd/mod.rs @@ -648,17 +648,6 @@ pub const SI_LOAD_SHIFT: ::c_uint = 16; pub const SIGEV_SIGNAL: ::c_int = 0; pub const SIGEV_NONE: ::c_int = 1; pub const SIGEV_THREAD: ::c_int = 2; -#[cfg(not(any(target_env = "musl")))] -pub const SIGEV_THREAD_ID: ::c_int = 4; - -pub const AIO_CANCELED: ::c_int = 0; -pub const AIO_NOTCANCELED: ::c_int = 1; -pub const AIO_ALLDONE: ::c_int = 2; -pub const LIO_READ: ::c_int = 0; -pub const LIO_WRITE: ::c_int = 1; -pub const LIO_NOP: ::c_int = 2; -pub const LIO_WAIT: ::c_int = 0; -pub const LIO_NOWAIT: ::c_int = 1; f! { pub fn FD_CLR(fd: ::c_int, set: *mut fd_set) -> () { |