diff options
| author | Sebastian Schmidt <yath@yath.de> | 2012-04-17 11:23:35 +0200 |
|---|---|---|
| committer | Sebastian Schmidt <yath@yath.de> | 2012-04-17 11:24:20 +0200 |
| commit | f4b417c62a4f272c4cf9a074d0f7a3a97201f9db (patch) | |
| tree | e2196f3b6361e2377c43ab47a3abf17d8f6afd77 /builtins/ulimit.def | |
| parent | 791237e44695d2ee123c8a6f665ef074f5fadfbb (diff) | |
| download | external_bash-f4b417c62a4f272c4cf9a074d0f7a3a97201f9db.zip external_bash-f4b417c62a4f272c4cf9a074d0f7a3a97201f9db.tar.gz external_bash-f4b417c62a4f272c4cf9a074d0f7a3a97201f9db.tar.bz2 | |
Update to upstream bash 4.2
This upgrades bash to from 4.1-rc to 4.2-release. See CWRU/changelog for
changes.
Change-Id: I926269c300cf44fa25964b5b375a148fcf11c4b7
Diffstat (limited to 'builtins/ulimit.def')
| -rw-r--r-- | builtins/ulimit.def | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/builtins/ulimit.def b/builtins/ulimit.def index 7c1e256..03cbe8a 100644 --- a/builtins/ulimit.def +++ b/builtins/ulimit.def @@ -1,7 +1,7 @@ This file is ulimit.def, from which is created ulimit.c. It implements the builtin "ulimit" in Bash. -Copyright (C) 1987-2009 Free Software Foundation, Inc. +Copyright (C) 1987-2010 Free Software Foundation, Inc. This file is part of GNU Bash, the Bourne Again SHell. @@ -118,6 +118,10 @@ extern int errno; # undef HAVE_RESOURCE #endif +#if !defined (HAVE_RESOURCE) && defined (HAVE_ULIMIT_H) +# include <ulimit.h> +#endif + #if !defined (RLIMTYPE) # define RLIMTYPE long # define string_to_rlimtype(s) strtol(s, (char **)NULL, 10) |