Skip to content

Commit 3a5cfdd

Browse files
Alexander Polakovroot
Alexander Polakov
authored and
root
committed
Fix mips fallout on new toolchain
1 parent 2cdb21e commit 3a5cfdd

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

libc-test/build.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ fn main() {
142142
if !musl {
143143
cfg.header("linux/netlink.h");
144144
cfg.header("linux/magic.h");
145-
cfg.header("linux/fs.h");
146145

147146
if !mips {
148147
cfg.header("linux/quota.h");

src/unix/notbsd/linux/mips.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ s! {
6363
}
6464

6565
pub struct sigaction {
66-
pub sa_flags: ::c_uint,
66+
pub sa_flags: ::c_int,
6767
pub sa_sigaction: ::sighandler_t,
6868
pub sa_mask: sigset_t,
6969
_restorer: *mut ::c_void,
@@ -190,18 +190,18 @@ pub const RLIMIT_AS: ::c_int = 6;
190190
pub const RLIMIT_RSS: ::c_int = 7;
191191
pub const RLIMIT_NPROC: ::c_int = 8;
192192
pub const RLIMIT_MEMLOCK: ::c_int = 9;
193-
pub const RLIMIT_NLIMITS: ::c_int = 15;
193+
pub const RLIMIT_NLIMITS: ::c_int = 16;
194194
pub const RLIM_INFINITY: ::rlim_t = 0x7fffffff;
195195

196196
pub const O_APPEND: ::c_int = 8;
197197
pub const O_CREAT: ::c_int = 256;
198198
pub const O_EXCL: ::c_int = 1024;
199199
pub const O_NOCTTY: ::c_int = 2048;
200200
pub const O_NONBLOCK: ::c_int = 128;
201-
pub const O_SYNC: ::c_int = 0x10;
202-
pub const O_RSYNC: ::c_int = 0x10;
201+
pub const O_SYNC: ::c_int = 0x4010;
202+
pub const O_RSYNC: ::c_int = 0x4010;
203203
pub const O_DSYNC: ::c_int = 0x10;
204-
pub const O_FSYNC: ::c_int = 0x10;
204+
pub const O_FSYNC: ::c_int = 0x4010;
205205
pub const O_ASYNC: ::c_int = 0x1000;
206206
pub const O_NDELAY: ::c_int = 0x80;
207207

@@ -454,7 +454,7 @@ extern {
454454
hostlen: ::socklen_t,
455455
serv: *mut ::c_char,
456456
sevlen: ::socklen_t,
457-
flags: ::c_uint) -> ::c_int;
458-
pub fn eventfd(init: ::c_int, flags: ::c_int) -> ::c_int;
457+
flags: ::c_int) -> ::c_int;
458+
pub fn eventfd(init: ::c_uint, flags: ::c_int) -> ::c_int;
459459
pub fn ptrace(request: ::c_uint, ...) -> ::c_long;
460460
}

0 commit comments

Comments
 (0)