diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2005-04-04 10:00:25 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2005-04-04 10:00:25 +0000 |
| commit | f12ca5fd8ee8922c6950a398e21286f2d59a428a (patch) | |
| tree | c5ed303bac133ef9a5eb4ab5468cf8b862ea6fc1 /Src/Builtins | |
| parent | 6df44faf120b4abf8bf259a3d50deb1637335e54 (diff) | |
| download | zsh-f12ca5fd8ee8922c6950a398e21286f2d59a428a.tar.gz zsh-f12ca5fd8ee8922c6950a398e21286f2d59a428a.tar.xz zsh-f12ca5fd8ee8922c6950a398e21286f2d59a428a.zip | |
Toby Peterson: 21083: RLIMIT_AS and RLIMIT_RSS are the same in Mac OX X
ut_name needs to be ut_user in struct utmpx
Diffstat (limited to 'Src/Builtins')
| -rw-r--r-- | Src/Builtins/rlimits.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Src/Builtins/rlimits.c b/Src/Builtins/rlimits.c index 9256f25b2..922a182a2 100644 --- a/Src/Builtins/rlimits.c +++ b/Src/Builtins/rlimits.c @@ -242,7 +242,7 @@ printulimit(char *nam, int lim, int hard, int head) # endif /* HAVE_RLIMIT_MEMLOCK */ /* If RLIMIT_VMEM and RLIMIT_RSS are defined and equal, avoid * * duplicate case statement. Observed on QNX Neutrino 6.1.0. */ -# if defined(HAVE_RLIMIT_RSS) && !defined(RLIMIT_VMEM_IS_RSS) +# if defined(HAVE_RLIMIT_RSS) && !defined(RLIMIT_VMEM_IS_RSS) && !defined(RLIMIT_RSS_IS_AS) case RLIMIT_RSS: if (head) printf("-m: resident set size (kbytes) "); @@ -834,7 +834,7 @@ bin_ulimit(char *name, char **argv, UNUSED(Options ops), UNUSED(int func)) case RLIMIT_VMEM: # endif /* HAVE_RLIMIT_VMEM */ /* ditto RLIMIT_VMEM and RLIMIT_AS */ -# if defined(HAVE_RLIMIT_AS) && !defined(RLIMIT_VMEM_IS_AS) +# if defined(HAVE_RLIMIT_AS) && !defined(RLIMIT_VMEM_IS_AS) && !defined(RLIMIT_RSS_IS_AS) case RLIMIT_AS: # endif /* HAVE_RLIMIT_AS */ # ifdef HAVE_RLIMIT_AIO_MEM |