From 88e49082fb30bfbb54e4c3b7ef2b37a8ae1270f5 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Wed, 5 Jun 2002 09:15:51 +0000 Subject: 17285: David Wolfe : finally fix QNX rlimits problem --- Src/Builtins/rlimits.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Src') diff --git a/Src/Builtins/rlimits.c b/Src/Builtins/rlimits.c index 0df671786..f19cdfab9 100644 --- a/Src/Builtins/rlimits.c +++ b/Src/Builtins/rlimits.c @@ -565,7 +565,9 @@ bin_ulimit(char *name, char **argv, char *ops, int func) # ifdef RLIMIT_MEMLOCK case RLIMIT_MEMLOCK: # endif /* RLIMIT_MEMLOCK */ -# ifdef RLIMIT_VMEM +/* If RLIMIT_VMEM and RLIMIT_RSS are defined and equal, avoid * + * duplicate case statement. Observed on QNX Neutrino 6.1.0. */ +# if defined(RLIMIT_VMEM) && (!defined(RLIMIT_RSS) || RLIMIT_RSS != RLIMIT_VMEM) case RLIMIT_VMEM: # endif /* RLIMIT_VMEM */ # ifdef RLIMIT_AIO_MEM -- cgit 1.4.1