Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
7d37642884
|
@ -1,7 +1,7 @@
|
|||
[package]
|
||||
|
||||
name = "libc"
|
||||
version = "0.2.13"
|
||||
version = "0.2.14"
|
||||
authors = ["The Rust Project Developers"]
|
||||
license = "MIT/Apache-2.0"
|
||||
readme = "README.md"
|
||||
|
|
|
@ -3,7 +3,7 @@ name = "libc-test"
|
|||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"ctest 0.1.0 (git+https://github.com/alexcrichton/ctest)",
|
||||
"libc 0.2.13",
|
||||
"libc 0.2.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
@ -41,7 +41,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.13"
|
||||
version = "0.2.14"
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
|
|
|
@ -316,6 +316,7 @@ pub const SIGINT: ::c_int = 2;
|
|||
pub const SIGQUIT: ::c_int = 3;
|
||||
pub const SIGILL: ::c_int = 4;
|
||||
pub const SIGABRT: ::c_int = 6;
|
||||
pub const SIGEMT: ::c_int = 7;
|
||||
pub const SIGFPE: ::c_int = 8;
|
||||
pub const SIGKILL: ::c_int = 9;
|
||||
pub const SIGSEGV: ::c_int = 11;
|
||||
|
|
|
@ -181,6 +181,7 @@ pub const SIGINT : ::c_int = 2;
|
|||
pub const SIGQUIT : ::c_int = 3;
|
||||
pub const SIGILL : ::c_int = 4;
|
||||
pub const SIGABRT : ::c_int = 6;
|
||||
pub const SIGEMT: ::c_int = 7;
|
||||
pub const SIGFPE : ::c_int = 8;
|
||||
pub const SIGKILL : ::c_int = 9;
|
||||
pub const SIGSEGV : ::c_int = 11;
|
||||
|
|
|
@ -110,7 +110,12 @@ s! {
|
|||
pub ws_ypixel: ::c_ushort,
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "android"))]
|
||||
pub struct linger {
|
||||
pub l_onoff: ::c_int,
|
||||
pub l_linger: ::c_int,
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "android"))]
|
||||
pub struct if_nameindex {
|
||||
pub if_index: ::c_uint,
|
||||
pub if_name: *mut ::c_char,
|
||||
|
@ -704,8 +709,6 @@ extern {
|
|||
extern {
|
||||
pub fn getifaddrs(ifap: *mut *mut ifaddrs) -> ::c_int;
|
||||
pub fn freeifaddrs(ifa: *mut ifaddrs);
|
||||
pub fn if_nameindex() -> *mut if_nameindex;
|
||||
pub fn if_freenameindex(ptr: *mut if_nameindex);
|
||||
#[cfg_attr(target_os = "macos", link_name = "glob$INODE64")]
|
||||
#[cfg_attr(target_os = "netbsd", link_name = "__glob30")]
|
||||
pub fn glob(pattern: *const c_char,
|
||||
|
|
|
@ -501,6 +501,8 @@ pub const EPOLL_CTL_ADD: ::c_int = 1;
|
|||
pub const EPOLL_CTL_MOD: ::c_int = 3;
|
||||
pub const EPOLL_CTL_DEL: ::c_int = 2;
|
||||
|
||||
pub const EPOLL_CLOEXEC: ::c_int = 0x80000;
|
||||
|
||||
pub const MNT_DETACH: ::c_int = 0x2;
|
||||
pub const MNT_EXPIRE: ::c_int = 0x4;
|
||||
|
||||
|
@ -749,6 +751,7 @@ extern {
|
|||
pub fn sched_get_priority_max(policy: ::c_int) -> ::c_int;
|
||||
pub fn sched_get_priority_min(policy: ::c_int) -> ::c_int;
|
||||
pub fn epoll_create(size: ::c_int) -> ::c_int;
|
||||
pub fn epoll_create1(flags: ::c_int) -> ::c_int;
|
||||
pub fn epoll_ctl(epfd: ::c_int,
|
||||
op: ::c_int,
|
||||
fd: ::c_int,
|
||||
|
|
|
@ -506,6 +506,7 @@ pub const SIGINT: ::c_int = 2;
|
|||
pub const SIGQUIT: ::c_int = 3;
|
||||
pub const SIGILL: ::c_int = 4;
|
||||
pub const SIGABRT: ::c_int = 6;
|
||||
pub const SIGEMT: ::c_int = 7;
|
||||
pub const SIGFPE: ::c_int = 8;
|
||||
pub const SIGKILL: ::c_int = 9;
|
||||
pub const SIGSEGV: ::c_int = 11;
|
||||
|
@ -885,6 +886,22 @@ pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2;
|
|||
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 4;
|
||||
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
|
||||
|
||||
pub const RTLD_NEXT: *mut ::c_void = -1isize as *mut ::c_void;
|
||||
pub const RTLD_DEFAULT: *mut ::c_void = -2isize as *mut ::c_void;
|
||||
pub const RTLD_SELF: *mut ::c_void = -3isize as *mut ::c_void;
|
||||
pub const RTLD_PROBE: *mut ::c_void = -4isize as *mut ::c_void;
|
||||
|
||||
pub const RTLD_NOW: ::c_int = 0x2;
|
||||
pub const RTLD_NOLOAD: ::c_int = 0x4;
|
||||
pub const RTLD_GLOBAL: ::c_int = 0x100;
|
||||
pub const RTLD_LOCAL: ::c_int = 0x0;
|
||||
pub const RTLD_PARENT: ::c_int = 0x200;
|
||||
pub const RTLD_GROUP: ::c_int = 0x400;
|
||||
pub const RTLD_WORLD: ::c_int = 0x800;
|
||||
pub const RTLD_NODELETE: ::c_int = 0x1000;
|
||||
pub const RTLD_FIRST: ::c_int = 0x2000;
|
||||
pub const RTLD_CONFGEN: ::c_int = 0x10000;
|
||||
|
||||
f! {
|
||||
pub fn FD_CLR(fd: ::c_int, set: *mut fd_set) -> () {
|
||||
let fd = fd as usize;
|
||||
|
|
Loading…
Reference in New Issue