From 87ff6cda847a11db5994205cb068d8deb8c4fdd1 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Wed, 2 Nov 2016 10:41:27 +0000 Subject: Post-merge fix --- shell/ash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) return pid; } #define waitpid(p, s, f) waitpid_child(s, f) -#define wait_block_or_sig(s, f) waitpid_child(s, f) +#define wait_block_or_sig(s) waitpid_child(s, 0) #else -- cgit v1.2.3-55-g6feb