diff options
author | Alex Crichton <alex@alexcrichton.com> | 2016-03-06 23:44:27 -0800 |
---|---|---|
committer | Alex Crichton <alex@alexcrichton.com> | 2016-03-06 23:44:27 -0800 |
commit | 08f816f745cbb0bb81262bbb7d3da3c6dbadcd3e (patch) | |
tree | 2033295be4b2474b79ff03f289d250f7a137455b | |
parent | e19309c8b4e8bbd11f4d84dfffd75e3d1ac477fe (diff) | |
parent | c01ec7ebfe240e919e020c5d0efebbe209eec7a3 (diff) | |
download | rust-libc-08f816f745cbb0bb81262bbb7d3da3c6dbadcd3e.tar.gz |
Merge pull request #216 from alexcrichton/merge
Merging more PRs in the queue
-rw-r--r-- | src/unix/mod.rs | 3 | ||||
-rw-r--r-- | src/unix/notbsd/android/b32.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/android/b64.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/linux/mips.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/linux/musl/b32/arm.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/linux/musl/b32/asmjs.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/linux/musl/b32/mips.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/linux/musl/b32/x86.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/linux/musl/b64/mod.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/linux/other/b32/arm.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/linux/other/b32/powerpc.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/linux/other/b32/x86.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/linux/other/b64/aarch64.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/linux/other/b64/powerpc64.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/linux/other/b64/x86_64.rs | 2 | ||||
-rw-r--r-- | src/unix/notbsd/mod.rs | 5 |
16 files changed, 21 insertions, 15 deletions
diff --git a/src/unix/mod.rs b/src/unix/mod.rs index 0f7083447b..6176402fb0 100644 --- a/src/unix/mod.rs +++ b/src/unix/mod.rs @@ -139,7 +139,8 @@ cfg_if! { if #[cfg(not(stdbuild))] { // cargo build, don't pull in anything extra as the libstd dep // already pulls in all libs. - } else if #[cfg(all(target_env = "musl", not(target_arch = "mips")))] { + } else if #[cfg(all(target_env = "musl", not(any(target_arch = "mips", + target_arch = "arm"))))] { #[link(name = "c", kind = "static")] extern {} } else if #[cfg(target_os = "emscripten")] { diff --git a/src/unix/notbsd/android/b32.rs b/src/unix/notbsd/android/b32.rs index ae9b6241c5..267060d422 100644 --- a/src/unix/notbsd/android/b32.rs +++ b/src/unix/notbsd/android/b32.rs @@ -9,4 +9,4 @@ s! { } } -pub const SYS_gettid: ::c_int = 224; +pub const SYS_gettid: ::c_long = 224; diff --git a/src/unix/notbsd/android/b64.rs b/src/unix/notbsd/android/b64.rs index 2749a6559a..5cf4f9d0c8 100644 --- a/src/unix/notbsd/android/b64.rs +++ b/src/unix/notbsd/android/b64.rs @@ -9,4 +9,4 @@ s! { } } -pub const SYS_gettid: ::c_int = 178; +pub const SYS_gettid: ::c_long = 178; diff --git a/src/unix/notbsd/linux/mips.rs b/src/unix/notbsd/linux/mips.rs index e2e1ca9a61..ac06dbf051 100644 --- a/src/unix/notbsd/linux/mips.rs +++ b/src/unix/notbsd/linux/mips.rs @@ -472,7 +472,7 @@ pub const RTLD_DEEPBIND: ::c_int = 0x10; pub const RTLD_GLOBAL: ::c_int = 0x4; pub const RTLD_NOLOAD: ::c_int = 0x8; -pub const SYS_gettid: ::c_int = 4222; // Valid for O32 +pub const SYS_gettid: ::c_long = 4222; // Valid for O32 extern { pub fn sysctl(name: *mut ::c_int, diff --git a/src/unix/notbsd/linux/musl/b32/arm.rs b/src/unix/notbsd/linux/musl/b32/arm.rs index 2b2f8769d0..bfd8f7c5ff 100644 --- a/src/unix/notbsd/linux/musl/b32/arm.rs +++ b/src/unix/notbsd/linux/musl/b32/arm.rs @@ -303,4 +303,4 @@ pub const TIOCMSET: ::c_ulong = 0x5418; pub const FIONREAD: ::c_ulong = 0x541B; pub const TIOCCONS: ::c_ulong = 0x541D; -pub const SYS_gettid: ::c_int = 224; +pub const SYS_gettid: ::c_long = 224; diff --git a/src/unix/notbsd/linux/musl/b32/asmjs.rs b/src/unix/notbsd/linux/musl/b32/asmjs.rs index 6e46b530b1..13790ef4df 100644 --- a/src/unix/notbsd/linux/musl/b32/asmjs.rs +++ b/src/unix/notbsd/linux/musl/b32/asmjs.rs @@ -303,4 +303,4 @@ pub const TIOCMSET: ::c_ulong = 0x5418; pub const FIONREAD: ::c_ulong = 0x541B; pub const TIOCCONS: ::c_ulong = 0x541D; -pub const SYS_gettid: ::c_int = 224; // Valid for arm (32-bit) and x86 (32-bit) +pub const SYS_gettid: ::c_long = 224; // Valid for arm (32-bit) and x86 (32-bit) diff --git a/src/unix/notbsd/linux/musl/b32/mips.rs b/src/unix/notbsd/linux/musl/b32/mips.rs index 890d4efb20..1fd9280f75 100644 --- a/src/unix/notbsd/linux/musl/b32/mips.rs +++ b/src/unix/notbsd/linux/musl/b32/mips.rs @@ -302,4 +302,4 @@ pub const TIOCMSET: ::c_ulong = 0x741D; pub const FIONREAD: ::c_ulong = 0x467F; pub const TIOCCONS: ::c_ulong = 0x80047478; -pub const SYS_gettid: ::c_int = 4222; // Valid for O32 +pub const SYS_gettid: ::c_long = 4222; // Valid for O32 diff --git a/src/unix/notbsd/linux/musl/b32/x86.rs b/src/unix/notbsd/linux/musl/b32/x86.rs index d678f1e83e..6a77e81911 100644 --- a/src/unix/notbsd/linux/musl/b32/x86.rs +++ b/src/unix/notbsd/linux/musl/b32/x86.rs @@ -304,4 +304,4 @@ pub const TIOCMSET: ::c_ulong = 0x5418; pub const FIONREAD: ::c_ulong = 0x541B; pub const TIOCCONS: ::c_ulong = 0x541D; -pub const SYS_gettid: ::c_int = 224; +pub const SYS_gettid: ::c_long = 224; diff --git a/src/unix/notbsd/linux/musl/b64/mod.rs b/src/unix/notbsd/linux/musl/b64/mod.rs index fa38e077cc..c49ab6d2b1 100644 --- a/src/unix/notbsd/linux/musl/b64/mod.rs +++ b/src/unix/notbsd/linux/musl/b64/mod.rs @@ -325,4 +325,4 @@ pub const TIOCMSET: ::c_ulong = 0x5418; pub const FIONREAD: ::c_ulong = 0x541B; pub const TIOCCONS: ::c_ulong = 0x541D; -pub const SYS_gettid: ::c_int = 186; // Valid for x86_64 +pub const SYS_gettid: ::c_long = 186; // Valid for x86_64 diff --git a/src/unix/notbsd/linux/other/b32/arm.rs b/src/unix/notbsd/linux/other/b32/arm.rs index 2383d6b919..8537d52a6a 100644 --- a/src/unix/notbsd/linux/other/b32/arm.rs +++ b/src/unix/notbsd/linux/other/b32/arm.rs @@ -19,4 +19,4 @@ pub const SO_SNDTIMEO: ::c_int = 21; pub const FIOCLEX: ::c_ulong = 0x5451; pub const FIONBIO: ::c_ulong = 0x5421; -pub const SYS_gettid: ::c_int = 224; +pub const SYS_gettid: ::c_long = 224; diff --git a/src/unix/notbsd/linux/other/b32/powerpc.rs b/src/unix/notbsd/linux/other/b32/powerpc.rs index 0ff7a4c642..52c285c4e1 100644 --- a/src/unix/notbsd/linux/other/b32/powerpc.rs +++ b/src/unix/notbsd/linux/other/b32/powerpc.rs @@ -19,4 +19,4 @@ pub const SO_SNDTIMEO: ::c_int = 19; pub const FIOCLEX: ::c_ulong = 0x20006601; pub const FIONBIO: ::c_ulong = 0x8004667e; -pub const SYS_gettid: ::c_int = 207; +pub const SYS_gettid: ::c_long = 207; diff --git a/src/unix/notbsd/linux/other/b32/x86.rs b/src/unix/notbsd/linux/other/b32/x86.rs index 92fcc6be38..edb5aa5d17 100644 --- a/src/unix/notbsd/linux/other/b32/x86.rs +++ b/src/unix/notbsd/linux/other/b32/x86.rs @@ -35,7 +35,7 @@ pub const SO_SNDTIMEO: ::c_int = 21; pub const FIOCLEX: ::c_ulong = 0x5451; pub const FIONBIO: ::c_ulong = 0x5421; -pub const SYS_gettid: ::c_int = 224; +pub const SYS_gettid: ::c_long = 224; extern { pub fn getcontext(ucp: *mut ucontext_t) -> ::c_int; diff --git a/src/unix/notbsd/linux/other/b64/aarch64.rs b/src/unix/notbsd/linux/other/b64/aarch64.rs index f174f8763e..d6f8b7ce9a 100644 --- a/src/unix/notbsd/linux/other/b64/aarch64.rs +++ b/src/unix/notbsd/linux/other/b64/aarch64.rs @@ -76,4 +76,4 @@ pub const SO_SNDTIMEO: ::c_int = 21; pub const FIOCLEX: ::c_ulong = 0x5451; pub const FIONBIO: ::c_ulong = 0x5421; -pub const SYS_gettid: ::c_int = 178; +pub const SYS_gettid: ::c_long = 178; diff --git a/src/unix/notbsd/linux/other/b64/powerpc64.rs b/src/unix/notbsd/linux/other/b64/powerpc64.rs index 10a2e17fa7..e9494ddd7d 100644 --- a/src/unix/notbsd/linux/other/b64/powerpc64.rs +++ b/src/unix/notbsd/linux/other/b64/powerpc64.rs @@ -74,4 +74,4 @@ pub const SO_SNDTIMEO: ::c_int = 19; pub const FIOCLEX: ::c_ulong = 0x20006601; pub const FIONBIO: ::c_ulong = 0x8004667e; -pub const SYS_gettid: ::c_int = 207; +pub const SYS_gettid: ::c_long = 207; diff --git a/src/unix/notbsd/linux/other/b64/x86_64.rs b/src/unix/notbsd/linux/other/b64/x86_64.rs index 543bcb5b05..5b608e1f8d 100644 --- a/src/unix/notbsd/linux/other/b64/x86_64.rs +++ b/src/unix/notbsd/linux/other/b64/x86_64.rs @@ -95,7 +95,7 @@ pub const PTRACE_SETFPXREGS: ::c_uint = 19; pub const PTRACE_GETREGS: ::c_uint = 12; pub const PTRACE_SETREGS: ::c_uint = 13; -pub const SYS_gettid: ::c_int = 186; +pub const SYS_gettid: ::c_long = 186; extern { pub fn getcontext(ucp: *mut ucontext_t) -> ::c_int; diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs index fb7eb7875f..6106438739 100644 --- a/src/unix/notbsd/mod.rs +++ b/src/unix/notbsd/mod.rs @@ -548,6 +548,9 @@ pub const POSIX_FADV_WILLNEED: ::c_int = 3; pub const POSIX_FADV_DONTNEED: ::c_int = 4; pub const POSIX_FADV_NOREUSE: ::c_int = 5; +pub const AT_FDCWD: ::c_int = -100; +pub const AT_SYMLINK_NOFOLLOW: ::c_int = 0x100; + f! { pub fn FD_CLR(fd: ::c_int, set: *mut fd_set) -> () { let fd = fd as usize; @@ -664,6 +667,8 @@ extern { pub fn posix_fadvise(fd: ::c_int, offset: ::off_t, len: ::off_t, advise: ::c_int) -> ::c_int; pub fn futimens(fd: ::c_int, times: *const ::timespec) -> ::c_int; + pub fn utimensat(dirfd: ::c_int, path: *const ::c_char, + times: *const ::timespec, flag: ::c_int) -> ::c_int; } cfg_if! { |