OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #27762 - alexcrichton:fix-libc, r=aturon

Browse Source 
The corrected signature of `ioctl` broke some crates on crates.io, and it's not
currently worth the major version bump of libc, so for now keep the old
signature around for crates.io builds only with a comment to remove it at a
future date.

This should allow libc on crates.io to update to the master version in-tree.
I've verified that this was the only breakage of substance between the version
libc is currently built with and today's master branch.
This commit is contained in:
bors 2015-08-13 07:07:34 +00:00
commit ea3cd022ef
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/liblibc/lib.rs
View File

@ -6263,11 +6263,22 @@ 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, c_ulong, size_t};
use types::os::arch::c95::{c_uchar, c_int, size_t};
#[cfg(not(feature = "cargo-build"))]
use types::os::arch::c95::c_ulong;
extern {
#[cfg(not(all(target_os = "android", target_arch = "aarch64")))]
pub fn getdtablesize() -> c_int;
// Note that the correct signature of ioctl broke some crates on
// crates.io, so for now we keep the broken signature for crates.io
// but we fix it locally in the main Rust distribution. Once a new
// major version of libc is released on crates.io this #[cfg] should
// go away.
#[cfg(feature = "cargo-build")]
pub fn ioctl(fd: c_int, request: c_int, ...) -> c_int;
#[cfg(not(feature = "cargo-build"))]
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;