about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2001-10-22 17:18:29 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2001-10-22 17:18:29 +0000
commitacd69a7ba3eaafe44799d78c49eeeaefb49baa8d (patch)
tree9df8a0eaf75203c491d0981bda308a8f6ce588dd
parent3793c1c05b1b7d8303bdad37e7295a61ac27cd62 (diff)
downloadzsh-acd69a7ba3eaafe44799d78c49eeeaefb49baa8d.tar.gz
zsh-acd69a7ba3eaafe44799d78c49eeeaefb49baa8d.tar.xz
zsh-acd69a7ba3eaafe44799d78c49eeeaefb49baa8d.zip
Pavel Roskin <proski@gnu.org>: compilation for QNX
-rw-r--r--ChangeLog8
-rw-r--r--Src/Builtins/rlimits.c6
-rw-r--r--aczsh.m42
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"