diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Src/Builtins/rlimits.c | 6 | ||||
| -rw-r--r-- | aczsh.m4 | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index fb0d72c1e..4ecd18b12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-10-22 Peter Stephenson <pws@csr.com> + + * 16033: Pavel Roskin <proski@gnu.org>: + Src/Builtins/rlimits.c: Undefine RLIMIT_RSS if it's equal to + RLIMIT_VMEM to avoid duplicate case value. + aczsh.m4 (zsh_LARGE_FILE_SUPPORT): Ignore output of getconf + if it returns "undefined". + 2001-10-22 Bart Schaefer <schaefer@zsh.org> * 16111: Src/Builtins/rlimits.c: Report error on attempt to set diff --git a/Src/Builtins/rlimits.c b/Src/Builtins/rlimits.c index 359e04ed0..2b03beb37 100644 --- a/Src/Builtins/rlimits.c +++ b/Src/Builtins/rlimits.c @@ -44,6 +44,12 @@ enum { # include "rlimits.h" +/* If RLIMIT_VMEM and RLIMIT_RSS are defined and equal, drop support * + * for RLIMIT_RSS. Observed on QNX Neutrino 6.1.0. */ +#if defined(RLIMIT_RSS) && defined(RLIMIT_VMEM) && (RLIMIT_RSS == RLIMIT_VMEM) +#undef RLIMIT_RSS +#endif + # if defined(RLIM_T_IS_QUAD_T) || defined(RLIM_T_IS_LONG_LONG) || defined(RLIM_T_IS_UNSIGNED) static rlim_t zstrtorlimt(const char *s, char **t, int base) diff --git a/aczsh.m4 b/aczsh.m4 index f1dc6a1ef..bdce49022 100644 --- a/aczsh.m4 +++ b/aczsh.m4 @@ -43,7 +43,7 @@ for ac_shellvar in $ac_shellvars; do esac (getconf $ac_lfsvar) >/dev/null 2>&1 || { ac_result=no; break; } ac_getconf=`getconf $ac_lfsvar` - if test -n "$ac_getconf"; then + if test -n "$ac_getconf" && test "$ac_getconf" != "undefined"; then eval test '"${'$ac_shellvar'+set}"' = set && ac_set=$ac_shellvar ac_getconfs=$ac_getconfs$ac_getconf eval ac_test_$ac_shellvar="\$ac_getconf" |