diff options
| author | bors <bors@rust-lang.org> | 2019-05-28 12:45:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-28 12:45:23 +0000 |
| commit | 48193e89b6730395c69f94824a87f5427aa641b5 (patch) | |
| tree | f9f3ba92b531e74a6dbe81838f76dd880f5d2a5c /src/unix/notbsd/mod.rs | |
| parent | 8e2e498a45b8774be6deccb04d502538c5f1ba22 (diff) | |
| parent | 1a3d1525da37e295f659424258df4566a1755abf (diff) | |
| download | rust-libc-48193e89b6730395c69f94824a87f5427aa641b5.tar.gz | |
Auto merge of #1365 - gnzlbg:cleanup_linux, r=gnzlbg
[breaking change] Cleanup linux and update MUSL
* Update MUSL kernel headers to 4.4.2 (non-breaking)
* [breaking] `MADV_SOFT_OFFLINE` is not defined on MIPS
* [breaking] `sendmmsg`/`recvmmsg` take an `unsigned int` flag on MUSL
* [breaking] `pthread_t` is a pointer on MUSL
* `rlimit` resources should use a type alias on GNU (non-breaking)
* Deprecate `SIGNUNUSED` (should use SIGSYS instead)
Diffstat (limited to 'src/unix/notbsd/mod.rs')
| -rw-r--r-- | src/unix/notbsd/mod.rs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/unix/notbsd/mod.rs b/src/unix/notbsd/mod.rs index 3d388cc579..9f3bb3507e 100644 --- a/src/unix/notbsd/mod.rs +++ b/src/unix/notbsd/mod.rs @@ -667,7 +667,6 @@ pub const MADV_NOHUGEPAGE: ::c_int = 15; pub const MADV_DONTDUMP: ::c_int = 16; pub const MADV_DODUMP: ::c_int = 17; pub const MADV_HWPOISON: ::c_int = 100; -pub const MADV_SOFT_OFFLINE: ::c_int = 101; pub const IFF_UP: ::c_int = 0x1; pub const IFF_BROADCAST: ::c_int = 0x2; @@ -1330,7 +1329,6 @@ extern { pub fn fstatat64(dirfd: ::c_int, pathname: *const c_char, buf: *mut stat64, flags: ::c_int) -> ::c_int; pub fn ftruncate64(fd: ::c_int, length: off64_t) -> ::c_int; - pub fn getrlimit64(resource: ::c_int, rlim: *mut rlimit64) -> ::c_int; pub fn lseek64(fd: ::c_int, offset: off64_t, whence: ::c_int) -> off64_t; pub fn lstat64(path: *const c_char, buf: *mut stat64) -> ::c_int; pub fn mmap64(addr: *mut ::c_void, @@ -1359,7 +1357,6 @@ extern { pub fn readdir64(dirp: *mut ::DIR) -> *mut ::dirent64; pub fn readdir64_r(dirp: *mut ::DIR, entry: *mut ::dirent64, result: *mut *mut ::dirent64) -> ::c_int; - pub fn setrlimit64(resource: ::c_int, rlim: *const rlimit64) -> ::c_int; pub fn stat64(path: *const c_char, buf: *mut stat64) -> ::c_int; pub fn truncate64(path: *const c_char, length: off64_t) -> ::c_int; |