diff options
| author | bors <bors@rust-lang.org> | 2019-06-02 09:14:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-02 09:14:49 +0000 |
| commit | 0e2549387716c156b44a51882e349ad6ca9611c9 (patch) | |
| tree | a81c4bf937f7745b791a7c43c9c2aa3af4d59d1a /src/unix/notbsd/linux/s390x/mod.rs | |
| parent | cdc48ea36d8d2890dba38e8f779001e6855339a2 (diff) | |
| parent | 5f7600c13726aaaa8487a3fa4ae5a31ce6d37d58 (diff) | |
| download | rust-libc-0.2.58.tar.gz | |
Auto merge of #1384 - gnzlbg:upgrade_rlimit_consts, r=gnzlbg0.2.58
Upgrade rlimit consts
cc @aidanhs - this should fix the error you are seeing.
Diffstat (limited to 'src/unix/notbsd/linux/s390x/mod.rs')
| -rw-r--r-- | src/unix/notbsd/linux/s390x/mod.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/unix/notbsd/linux/s390x/mod.rs b/src/unix/notbsd/linux/s390x/mod.rs index 5572094029..7a7b426a39 100644 --- a/src/unix/notbsd/linux/s390x/mod.rs +++ b/src/unix/notbsd/linux/s390x/mod.rs @@ -469,13 +469,13 @@ pub const SO_RXQ_OVFL: ::c_int = 40; pub const SO_PEEK_OFF: ::c_int = 42; pub const SO_BUSY_POLL: ::c_int = 46; -pub const RLIMIT_RSS: ::c_int = 5; -pub const RLIMIT_NOFILE: ::c_int = 7; -pub const RLIMIT_AS: ::c_int = 9; -pub const RLIMIT_NPROC: ::c_int = 6; -pub const RLIMIT_MEMLOCK: ::c_int = 8; -pub const RLIMIT_RTTIME: ::c_int = 15; -pub const RLIMIT_NLIMITS: ::c_int = 16; +pub const RLIMIT_RSS: ::__rlimit_resource_t = 5; +pub const RLIMIT_NOFILE: ::__rlimit_resource_t = 7; +pub const RLIMIT_AS: ::__rlimit_resource_t = 9; +pub const RLIMIT_NPROC: ::__rlimit_resource_t = 6; +pub const RLIMIT_MEMLOCK: ::__rlimit_resource_t = 8; +pub const RLIMIT_RTTIME: ::__rlimit_resource_t = 15; +pub const RLIMIT_NLIMITS: ::__rlimit_resource_t = 16; pub const O_NOCTTY: ::c_int = 256; pub const O_SYNC: ::c_int = 1052672; |