about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2001-10-24 16:51:06 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2001-10-24 16:51:06 +0000
commit357a0ea7cf52085060e895156162885990171ec3 (patch)
treeb5b5ab9baa92c44b5ee2003135d1a5ec8030d1d4 /Src
parent18e997ec52d4cfa156585419f80719516a12351b (diff)
downloadzsh-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
Diffstat (limited to 'Src')
-rw-r--r--Src/Builtins/rlimits.c6
1 files changed, 6 insertions, 0 deletions
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)