diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2001-10-24 16:51:06 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2001-10-24 16:51:06 +0000 |
| commit | 357a0ea7cf52085060e895156162885990171ec3 (patch) | |
| tree | b5b5ab9baa92c44b5ee2003135d1a5ec8030d1d4 | |
| parent | 18e997ec52d4cfa156585419f80719516a12351b (diff) | |
| download | zsh-357a0ea7cf52085060e895156162885990171ec3.tar.gz zsh-357a0ea7cf52085060e895156162885990171ec3.tar.xz zsh-357a0ea7cf52085060e895156162885990171ec3.zip | |
16033: QNX Neutrino fix from Pavel Roskin
16135: pack up more zsh*.html files for doc distribution unposted: Config/version.mk: create 4.0.3
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | Config/version.mk | 4 | ||||
| -rw-r--r-- | Doc/.distfiles | 6 | ||||
| -rw-r--r-- | Src/Builtins/rlimits.c | 6 | ||||
| -rw-r--r-- | aczsh.m4 | 2 |
5 files changed, 25 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 806f2a15b..684ef3bfb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2001-10-24 Peter Stephenson <pws@csr.com> + + * unposted: Config/version.mk: create 4.0.3. + + * 16135: Doc/.distfiles: pack up more of the .distfiles produced + by texi2html, see 16130. + + * 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-24 Bart Schaefer <schaefer@zsh.org> * Sven: 16041, Bart: 16038, 16124: Src/cond.c, Src/loop.c: for diff --git a/Config/version.mk b/Config/version.mk index 4db32357f..763a031a6 100644 --- a/Config/version.mk +++ b/Config/version.mk @@ -27,5 +27,5 @@ # This must also serve as a shell script, so do not add spaces around the # `=' signs. -VERSION=4.0.2 -VERSION_DATE='June 25, 2001' +VERSION=4.0.3 +VERSION_DATE='October 24, 2001' diff --git a/Doc/.distfiles b/Doc/.distfiles index 85ecba62c..b88ddfcbd 100644 --- a/Doc/.distfiles +++ b/Doc/.distfiles @@ -4,15 +4,15 @@ DISTFILES_SRC=' version.yo zmacros.yo zman.yo ztexi.yo zsh.yo zshbuiltins.yo zshcompctl.yo zshcompsys.yo zshcompwid.yo zshexpn.yo zshmisc.yo zshmodules.yo zshoptions.yo zshparam.yo - zshzftpsys.yo zshzle.yo + zshzftpsys.yo zshzle.yo zshcontrib.yo zsh.texi zsh.1 zshbuiltins.1 zshcompctl.1 zshcompsys.1 zshcompwid.1 zshexpn.1 zshmisc.1 zshmodules.1 zshoptions.1 zshparam.1 zshzle.1 zshall.1 - zshzftpsys.1 + zshzftpsys.1 zshcontrib.1 ' DISTFILES_DOC=' zsh.info zsh.info-[0-9]* - zsh_*toc.html zsh_[0-9]*.html + zsh*.html zsh.dvi zsh_us.ps zsh_a4.ps ' 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" |