Skip to content

Commit 0e25493

Browse files
committed
Auto merge of #1384 - gnzlbg:upgrade_rlimit_consts, r=gnzlbg
Upgrade rlimit consts cc @aidanhs - this should fix the error you are seeing.
2 parents cdc48ea + 5f7600c commit 0e25493

File tree

9 files changed

+29
-29
lines changed

9 files changed

+29
-29
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "libc"
3-
version = "0.2.57"
3+
version = "0.2.58"
44
authors = ["The Rust Project Developers"]
55
license = "MIT OR Apache-2.0"
66
readme = "README.md"

src/unix/notbsd/linux/mips/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,12 +197,12 @@ pub const O_NOFOLLOW: ::c_int = 0x20000;
197197
pub const ST_RELATIME: ::c_ulong = 4096;
198198
pub const NI_MAXHOST: ::socklen_t = 1025;
199199

200-
pub const RLIMIT_NOFILE: ::c_int = 5;
201-
pub const RLIMIT_AS: ::c_int = 6;
202-
pub const RLIMIT_RSS: ::c_int = 7;
203-
pub const RLIMIT_NPROC: ::c_int = 8;
204-
pub const RLIMIT_MEMLOCK: ::c_int = 9;
205-
pub const RLIMIT_NLIMITS: ::c_int = 16;
200+
pub const RLIMIT_NOFILE: ::__rlimit_resource_t = 5;
201+
pub const RLIMIT_AS: ::__rlimit_resource_t = 6;
202+
pub const RLIMIT_RSS: ::__rlimit_resource_t = 7;
203+
pub const RLIMIT_NPROC: ::__rlimit_resource_t = 8;
204+
pub const RLIMIT_MEMLOCK: ::__rlimit_resource_t = 9;
205+
pub const RLIMIT_NLIMITS: ::__rlimit_resource_t = 16;
206206

207207
pub const O_APPEND: ::c_int = 8;
208208
pub const O_CREAT: ::c_int = 256;

src/unix/notbsd/linux/other/b32/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ s! {
9191
pub const TIOCGSOFTCAR: ::c_ulong = 0x5419;
9292
pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;
9393

94-
pub const RLIMIT_NOFILE: ::c_int = 7;
95-
pub const RLIMIT_NPROC: ::c_int = 6;
94+
pub const RLIMIT_NOFILE: ::__rlimit_resource_t = 7;
95+
pub const RLIMIT_NPROC: ::__rlimit_resource_t = 6;
9696

9797
pub const O_APPEND: ::c_int = 1024;
9898
pub const O_CREAT: ::c_int = 64;

src/unix/notbsd/linux/other/b64/aarch64.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;
150150
pub const TIOCGRS485: ::c_int = 0x542E;
151151
pub const TIOCSRS485: ::c_int = 0x542F;
152152

153-
pub const RLIMIT_NOFILE: ::c_int = 7;
154-
pub const RLIMIT_NPROC: ::c_int = 6;
153+
pub const RLIMIT_NOFILE: ::__rlimit_resource_t = 7;
154+
pub const RLIMIT_NPROC: ::__rlimit_resource_t = 6;
155155

156156
pub const O_APPEND: ::c_int = 1024;
157157
pub const O_CREAT: ::c_int = 64;

src/unix/notbsd/linux/other/b64/powerpc64.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
135135
pub const TIOCGSOFTCAR: ::c_ulong = 0x5419;
136136
pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;
137137

138-
pub const RLIMIT_NOFILE: ::c_int = 7;
139-
pub const RLIMIT_NPROC: ::c_int = 6;
138+
pub const RLIMIT_NOFILE: ::__rlimit_resource_t = 7;
139+
pub const RLIMIT_NPROC: ::__rlimit_resource_t = 6;
140140

141141
pub const O_APPEND: ::c_int = 1024;
142142
pub const O_CREAT: ::c_int = 64;

src/unix/notbsd/linux/other/b64/sparc64.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
148148
pub const TIOCGSOFTCAR: ::c_ulong = 0x40047464;
149149
pub const TIOCSSOFTCAR: ::c_ulong = 0x80047465;
150150

151-
pub const RLIMIT_NOFILE: ::c_int = 6;
152-
pub const RLIMIT_NPROC: ::c_int = 7;
151+
pub const RLIMIT_NOFILE: ::__rlimit_resource_t = 6;
152+
pub const RLIMIT_NPROC: ::__rlimit_resource_t = 7;
153153

154154
pub const O_APPEND: ::c_int = 0x8;
155155
pub const O_CREAT: ::c_int = 0x200;

src/unix/notbsd/linux/other/b64/x86_64.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,8 @@ pub const TIOCSSOFTCAR: ::c_ulong = 0x541A;
335335
pub const TIOCGRS485: ::c_int = 0x542E;
336336
pub const TIOCSRS485: ::c_int = 0x542F;
337337

338-
pub const RLIMIT_NOFILE: ::c_int = 7;
339-
pub const RLIMIT_NPROC: ::c_int = 6;
338+
pub const RLIMIT_NOFILE: ::__rlimit_resource_t = 7;
339+
pub const RLIMIT_NPROC: ::__rlimit_resource_t = 6;
340340

341341
pub const O_APPEND: ::c_int = 1024;
342342
pub const O_CREAT: ::c_int = 64;

src/unix/notbsd/linux/other/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -368,12 +368,12 @@ pub const USER_PROCESS: ::c_short = 7;
368368
pub const DEAD_PROCESS: ::c_short = 8;
369369
pub const ACCOUNTING: ::c_short = 9;
370370

371-
pub const RLIMIT_RSS: ::c_int = 5;
372-
pub const RLIMIT_AS: ::c_int = 9;
373-
pub const RLIMIT_MEMLOCK: ::c_int = 8;
371+
pub const RLIMIT_RSS: ::__rlimit_resource_t = 5;
372+
pub const RLIMIT_AS: ::__rlimit_resource_t = 9;
373+
pub const RLIMIT_MEMLOCK: ::__rlimit_resource_t = 8;
374374
pub const RLIM_INFINITY: ::rlim_t = !0;
375-
pub const RLIMIT_RTTIME: ::c_int = 15;
376-
pub const RLIMIT_NLIMITS: ::c_int = 16;
375+
pub const RLIMIT_RTTIME: ::__rlimit_resource_t = 15;
376+
pub const RLIMIT_NLIMITS: ::__rlimit_resource_t = 16;
377377

378378
pub const SOCK_NONBLOCK: ::c_int = O_NONBLOCK;
379379

src/unix/notbsd/linux/s390x/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -469,13 +469,13 @@ pub const SO_RXQ_OVFL: ::c_int = 40;
469469
pub const SO_PEEK_OFF: ::c_int = 42;
470470
pub const SO_BUSY_POLL: ::c_int = 46;
471471

472-
pub const RLIMIT_RSS: ::c_int = 5;
473-
pub const RLIMIT_NOFILE: ::c_int = 7;
474-
pub const RLIMIT_AS: ::c_int = 9;
475-
pub const RLIMIT_NPROC: ::c_int = 6;
476-
pub const RLIMIT_MEMLOCK: ::c_int = 8;
477-
pub const RLIMIT_RTTIME: ::c_int = 15;
478-
pub const RLIMIT_NLIMITS: ::c_int = 16;
472+
pub const RLIMIT_RSS: ::__rlimit_resource_t = 5;
473+
pub const RLIMIT_NOFILE: ::__rlimit_resource_t = 7;
474+
pub const RLIMIT_AS: ::__rlimit_resource_t = 9;
475+
pub const RLIMIT_NPROC: ::__rlimit_resource_t = 6;
476+
pub const RLIMIT_MEMLOCK: ::__rlimit_resource_t = 8;
477+
pub const RLIMIT_RTTIME: ::__rlimit_resource_t = 15;
478+
pub const RLIMIT_NLIMITS: ::__rlimit_resource_t = 16;
479479

480480
pub const O_NOCTTY: ::c_int = 256;
481481
pub const O_SYNC: ::c_int = 1052672;

0 commit comments

Comments
 (0)