diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-09-07 11:48:25 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-09-07 11:48:25 +0100 |
| commit | fecf687cc358883de2da21de33346f0df204c80b (patch) | |
| tree | d22c606157926fb659374ae68d55e3a874bacf25 /runit | |
| parent | b25a7c28a0f684087fa6ccbbc7e265a9cac0f0fa (diff) | |
| parent | 6d463de46b418e6c4c8d1397033608f78b33ab21 (diff) | |
| download | busybox-w32-fecf687cc358883de2da21de33346f0df204c80b.tar.gz busybox-w32-fecf687cc358883de2da21de33346f0df204c80b.tar.bz2 busybox-w32-fecf687cc358883de2da21de33346f0df204c80b.zip | |
Merge branch 'busybox' into merge
Conflicts:
include/libbb.h
shell/ash.c
Diffstat (limited to 'runit')
| -rw-r--r-- | runit/chpst.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runit/chpst.c b/runit/chpst.c index ac296babf..ed72c8b8c 100644 --- a/runit/chpst.c +++ b/runit/chpst.c | |||
| @@ -91,6 +91,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||
| 91 | //usage: "\n a SIGXCPU after N seconds" | 91 | //usage: "\n a SIGXCPU after N seconds" |
| 92 | 92 | ||
| 93 | #include "libbb.h" | 93 | #include "libbb.h" |
| 94 | #include <sys/resource.h> /* getrlimit */ | ||
| 94 | 95 | ||
| 95 | /* | 96 | /* |
| 96 | Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit. | 97 | Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit. |