emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

platform.h: fix for Bionic >= 21 not having wait3()

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2021-04-14 22:14:36 +02:00
parent cca4c9f4c0
commit c0943ac451
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/platform.h
View File

@@ -424,6 +424,7 @@ typedef unsigned smalluint;
#define HAVE_NET_ETHERNET_H 1 #define HAVE_NET_ETHERNET_H 1
#define HAVE_SYS_STATFS_H 1 #define HAVE_SYS_STATFS_H 1
#define HAVE_PRINTF_PERCENTM 1 #define HAVE_PRINTF_PERCENTM 1
#define HAVE_WAIT3 1
#if defined(__UCLIBC__) #if defined(__UCLIBC__)
# if UCLIBC_VERSION < KERNEL_VERSION(0, 9, 32) # if UCLIBC_VERSION < KERNEL_VERSION(0, 9, 32)
@@ -535,6 +536,9 @@ typedef unsigned smalluint;
# undef HAVE_STPCPY # undef HAVE_STPCPY
# undef HAVE_STPNCPY # undef HAVE_STPNCPY
# endif # endif
# if __ANDROID_API__ >= 21
# undef HAVE_WAIT3
# endif
# undef HAVE_MEMPCPY # undef HAVE_MEMPCPY
# undef HAVE_STRCHRNUL # undef HAVE_STRCHRNUL
# undef HAVE_STRVERSCMP # undef HAVE_STRVERSCMP

7
miscutils/time.c
View File

@@ -33,6 +33,13 @@
#include "libbb.h" #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. */ /* Information on the resources used by a child process. */
typedef struct { typedef struct {
int waitstatus; int waitstatus;