diff options
| author | Ron Yorston <rmy@pobox.com> | 2016-11-02 10:41:27 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2016-11-02 10:41:27 +0000 |
| commit | 87ff6cda847a11db5994205cb068d8deb8c4fdd1 (patch) | |
| tree | 0a67842e2528c893e898953e568ce2544179e848 | |
| parent | e45ff573dc9707b1ea71f490ef16cd9d08feaaf2 (diff) | |
| download | busybox-w32-87ff6cda847a11db5994205cb068d8deb8c4fdd1.tar.gz busybox-w32-87ff6cda847a11db5994205cb068d8deb8c4fdd1.tar.bz2 busybox-w32-87ff6cda847a11db5994205cb068d8deb8c4fdd1.zip | |
Post-merge fix
| -rw-r--r-- | shell/ash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c index a709c3602..29eb44263 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -4215,7 +4215,7 @@ waitpid_child(int *status, int wait_flags) | |||
| 4215 | return pid; | 4215 | return pid; |
| 4216 | } | 4216 | } |
| 4217 | #define waitpid(p, s, f) waitpid_child(s, f) | 4217 | #define waitpid(p, s, f) waitpid_child(s, f) |
| 4218 | #define wait_block_or_sig(s, f) waitpid_child(s, f) | 4218 | #define wait_block_or_sig(s) waitpid_child(s, 0) |
| 4219 | 4219 | ||
| 4220 | #else | 4220 | #else |
| 4221 | 4221 | ||