Skip to content

Commit

Permalink
liblibc: correct Linux ioctl request type
Browse files Browse the repository at this point in the history
  • Loading branch information
emberian committed Jul 5, 2015
1 parent 8536152 commit f2fc920
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/liblibc/lib.rs
Expand Up @@ -6121,7 +6121,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,
Expand Down Expand Up @@ -6153,12 +6153,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)
Expand Down

1 comment on commit f2fc920

@jnicholls
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it would appear this broke some libraries, nix-rust for example. This should have been submoduled into libc as 0.2.0 and not 0.1.9. 0.1.9 would infer a compatible update from 0.1.8 which this is not.

Please sign in to comment.