diff options
| author | Denys Vlasenko | 2021-04-14 22:14:36 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2021-04-14 22:14:36 +0200 |
| commit | c0943ac451051b734711b0c95731ae7c515dbb31 (patch) | |
| tree | 88bf05eb7fa4a9f5aa91e243c01c50b94a36ab09 | |
| parent | cca4c9f4c0878b08fac6dfe014148ddcd5aa7678 (diff) | |
| download | busybox-c0943ac451051b734711b0c95731ae7c515dbb31.zip busybox-c0943ac451051b734711b0c95731ae7c515dbb31.tar.gz | |
platform.h: fix for Bionic >= 21 not having wait3()
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | include/platform.h | 4 | ||||
| -rw-r--r-- | miscutils/time.c | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/platform.h b/include/platform.h index 24efd18..387b6f5 100644 --- a/include/platform.h +++ b/include/platform.h @@ -424,6 +424,7 @@ typedef unsigned smalluint; #define HAVE_NET_ETHERNET_H 1 #define HAVE_SYS_STATFS_H 1 #define HAVE_PRINTF_PERCENTM 1 +#define HAVE_WAIT3 1 #if defined(__UCLIBC__) # if UCLIBC_VERSION < KERNEL_VERSION(0, 9, 32) @@ -535,6 +536,9 @@ typedef unsigned smalluint; # undef HAVE_STPCPY # undef HAVE_STPNCPY # endif +# if __ANDROID_API__ >= 21 +# undef HAVE_WAIT3 +# endif # undef HAVE_MEMPCPY # undef HAVE_STRCHRNUL # undef HAVE_STRVERSCMP diff --git a/miscutils/time.c b/miscutils/time.c index 0006c59..c4bcbcb 100644 --- a/miscutils/time.c +++ b/miscutils/time.c @@ -33,6 +33,13 @@ #include "libbb.h" +#ifndef HAVE_WAIT3 +static pid_t wait3(int *status, int options, struct rusage *rusage) +{ + return wait4(-1, status, options, rusage); +} +#endif + /* Information on the resources used by a child process. */ typedef struct { int waitstatus; |