diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2015-07-06 18:06:29 -0400 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2015-07-06 18:06:29 -0400 |
| commit | 58d0f28057abdba9e2cd04088bc65dff5a676377 (patch) | |
| tree | 2335fb442c191cf0f11f6e938cfc2017ad65c365 /src/liblibc | |
| parent | 539cc55018da6505b532dbdfb9f60e04f50a9250 (diff) | |
| parent | f2fc9209d05f4e6f59c289635af2d107e40a51f5 (diff) | |
| download | rust-58d0f28057abdba9e2cd04088bc65dff5a676377.tar.gz rust-58d0f28057abdba9e2cd04088bc65dff5a676377.zip | |
Rollup merge of #26809 - cmr:libc-ioctl, r=alexcrichton
None
Diffstat (limited to 'src/liblibc')
| -rw-r--r-- | src/liblibc/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index f66811e561a..2c5ebc25f6b 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -6128,7 +6128,7 @@ pub mod funcs { use types::os::arch::c95::{c_char, c_uchar, c_int, c_uint, c_ulong, size_t}; extern { - pub fn ioctl(d: c_int, request: c_ulong, ...) -> c_int; + pub fn ioctl(fd: c_int, request: c_ulong, ...) -> c_int; pub fn sysctl(name: *mut c_int, namelen: c_uint, oldp: *mut c_void, @@ -6160,12 +6160,12 @@ pub mod funcs { #[cfg(any(target_os = "linux", target_os = "android"))] pub mod bsd44 { use types::common::c95::{c_void}; - use types::os::arch::c95::{c_uchar, c_int, size_t}; + use types::os::arch::c95::{c_uchar, c_int, c_ulong, size_t}; extern { #[cfg(not(all(target_os = "android", target_arch = "aarch64")))] pub fn getdtablesize() -> c_int; - pub fn ioctl(d: c_int, request: c_int, ...) -> c_int; + pub fn ioctl(fd: c_int, request: c_ulong, ...) -> c_int; pub fn madvise(addr: *mut c_void, len: size_t, advice: c_int) -> c_int; pub fn mincore(addr: *mut c_void, len: size_t, vec: *mut c_uchar) |