From 93dec3a96a38141c6176eb07d51c59f0ab15d151 Mon Sep 17 00:00:00 2001 From: Stefan Neudorf Date: Fri, 1 Nov 2013 00:09:04 +0100 Subject: 31935: further updates to limits for BSD --- Src/Builtins/rlimits.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'Src/Builtins/rlimits.c') diff --git a/Src/Builtins/rlimits.c b/Src/Builtins/rlimits.c index a0f294876..e48a1d3e3 100644 --- a/Src/Builtins/rlimits.c +++ b/Src/Builtins/rlimits.c @@ -32,6 +32,10 @@ #if defined(HAVE_GETRLIMIT) && defined(RLIM_INFINITY) +#ifdef RLIMIT_POSIXLOCKS +# define RLIMIT_LOCKS RLIMIT_POSIXLOCKS +#endif + enum { ZLIMTYPE_MEMORY, ZLIMTYPE_NUMBER, @@ -386,12 +390,6 @@ printulimit(char *nam, int lim, int hard, int head) printf("-r: max rt priority "); break; # endif /* HAVE_RLIMIT_RTPRIO */ -# ifdef HAVE_RLIMIT_POSIXLOCKS - case RLIMIT_POSIXLOCKS: - if (head) - printf("-K: posixlocks "); - break; -# endif /* HAVE_RLIMIT_POSIXLOCKS */ # ifdef HAVE_RLIMIT_NPTS case RLIMIT_NPTS: if (head) @@ -401,7 +399,7 @@ printulimit(char *nam, int lim, int hard, int head) # ifdef HAVE_RLIMIT_SWAP case RLIMIT_SWAP: if (head) - printf("-w: swap limit (kbytes) "); + printf("-w: swap size (kbytes) "); if (limit != RLIM_INFINITY) limit /= 1024; break; @@ -870,11 +868,6 @@ bin_ulimit(char *name, char **argv, UNUSED(Options ops), UNUSED(int func)) res = RLIMIT_RTPRIO; break; # endif -# ifdef HAVE_RLIMIT_POSIXLOCKS - case 'K': - res = RLIMIT_POSIXLOCKS; - break; -# endif # ifdef HAVE_RLIMIT_NPTS case 'p': res = RLIMIT_NPTS; -- cgit 1.4.1