diff options
| author | Alexander Polakov <apolyakov@beget.ru> | 2015-12-27 12:08:59 +0300 |
|---|---|---|
| committer | root <admin@beget.ru> | 2016-01-05 22:44:01 +0300 |
| commit | 6ac75c16b18e3e23b291ac283cefc292e5264c6b (patch) | |
| tree | a63b4f37a0ec0fe673db6009e8efab791c3bb4c0 | |
| parent | 2cdb21ea2b9393a029e84ba9776e734dc3665aa5 (diff) | |
| download | rust-libc-6ac75c16b18e3e23b291ac283cefc292e5264c6b.tar.gz | |
Fix mips fallout on new toolchain
| -rw-r--r-- | src/unix/notbsd/linux/mips.rs | 15 | ||||
| -rw-r--r-- | src/unix/notbsd/linux/mod.rs | 1 | ||||
| -rw-r--r-- | src/unix/notbsd/linux/musl.rs | 1 | ||||
| -rw-r--r-- | src/unix/notbsd/linux/other/mod.rs | 1 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/unix/notbsd/linux/mips.rs b/src/unix/notbsd/linux/mips.rs index 41f173687a..b8f74b13ad 100644 --- a/src/unix/notbsd/linux/mips.rs +++ b/src/unix/notbsd/linux/mips.rs @@ -63,7 +63,7 @@ s! { } pub struct sigaction { - pub sa_flags: ::c_uint, + pub sa_flags: ::c_int, pub sa_sigaction: ::sighandler_t, pub sa_mask: sigset_t, _restorer: *mut ::c_void, @@ -190,7 +190,7 @@ pub const RLIMIT_AS: ::c_int = 6; pub const RLIMIT_RSS: ::c_int = 7; pub const RLIMIT_NPROC: ::c_int = 8; pub const RLIMIT_MEMLOCK: ::c_int = 9; -pub const RLIMIT_NLIMITS: ::c_int = 15; +pub const RLIMIT_NLIMITS: ::c_int = 16; pub const RLIM_INFINITY: ::rlim_t = 0x7fffffff; pub const O_APPEND: ::c_int = 8; @@ -198,10 +198,10 @@ pub const O_CREAT: ::c_int = 256; pub const O_EXCL: ::c_int = 1024; pub const O_NOCTTY: ::c_int = 2048; pub const O_NONBLOCK: ::c_int = 128; -pub const O_SYNC: ::c_int = 0x10; -pub const O_RSYNC: ::c_int = 0x10; +pub const O_SYNC: ::c_int = 0x4010; +pub const O_RSYNC: ::c_int = 0x4010; pub const O_DSYNC: ::c_int = 0x10; -pub const O_FSYNC: ::c_int = 0x10; +pub const O_FSYNC: ::c_int = 0x4010; pub const O_ASYNC: ::c_int = 0x1000; pub const O_NDELAY: ::c_int = 0x80; @@ -357,6 +357,7 @@ pub const SIG_UNBLOCK: ::c_int = 0x2; pub const PTHREAD_STACK_MIN: ::size_t = 131072; pub const MS_VERBOSE: ::c_ulong = 0x8000; +pub const MS_RMT_MASK: ::c_ulong = 0x2800051; pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5; pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff; @@ -454,7 +455,7 @@ extern { hostlen: ::socklen_t, serv: *mut ::c_char, sevlen: ::socklen_t, - flags: ::c_uint) -> ::c_int; - pub fn eventfd(init: ::c_int, flags: ::c_int) -> ::c_int; + flags: ::c_int) -> ::c_int; + pub fn eventfd(init: ::c_uint, flags: ::c_int) -> ::c_int; pub fn ptrace(request: ::c_uint, ...) -> ::c_long; } diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs index 512d5adc38..5d1c6f6b16 100644 --- a/src/unix/notbsd/linux/mod.rs +++ b/src/unix/notbsd/linux/mod.rs @@ -368,7 +368,6 @@ pub const MS_RELATIME: ::c_ulong = 0x200000; pub const MS_KERNMOUNT: ::c_ulong = 0x400000; pub const MS_I_VERSION: ::c_ulong = 0x800000; pub const MS_STRICTATIME: ::c_ulong = 0x01000000; -pub const MS_RMT_MASK: ::c_ulong = 0x800051; pub const EPOLLRDHUP: ::c_int = 0x2000; pub const EPOLLONESHOT: ::c_int = 0x40000000; diff --git a/src/unix/notbsd/linux/musl.rs b/src/unix/notbsd/linux/musl.rs index 7a244e49c4..1f1aff2a74 100644 --- a/src/unix/notbsd/linux/musl.rs +++ b/src/unix/notbsd/linux/musl.rs @@ -394,6 +394,7 @@ pub const EPOLLWAKEUP: ::c_int = 0x20000000; pub const MS_NOSEC: ::c_ulong = 0x10000000; pub const MS_BORN: ::c_ulong = 0x20000000; +pub const MS_RMT_MASK: ::c_ulong = 0x800051; pub const MADV_HUGEPAGE: ::c_int = 14; pub const MADV_NOHUGEPAGE: ::c_int = 15; diff --git a/src/unix/notbsd/linux/other/mod.rs b/src/unix/notbsd/linux/other/mod.rs index b2d9643812..1b97fff561 100644 --- a/src/unix/notbsd/linux/other/mod.rs +++ b/src/unix/notbsd/linux/other/mod.rs @@ -284,6 +284,7 @@ pub const ST_RELATIME: ::c_ulong = 4096; pub const NI_MAXHOST: ::socklen_t = 1025; pub const MS_VERBOSE: ::c_ulong = 0x8000; +pub const MS_RMT_MASK: ::c_ulong = 0x800051; pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5; pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff; |