busybox: squashed commit of merging cm-12.1
With fixes to LOCAL_C_INCLUDES for libsepol in M and fixed
some missing includes to enable building for 64 bit devices
Conflicts:
Android.mk
android/libc/arch-x86/syscalls/swapoff.S
android/libc/arch-x86/syscalls/swapon.S
android/libc/arch-x86/syscalls/sysinfo.S
android/librpc/pmap_rmt.c
android/reboot.c
include-full/copy-current.sh
include-minimal/copy-current.sh
include/platform.h
networking/interface.c
networking/nslookup.c
Change-Id: If6092fa87f3d21190db1af4f70daa150eb462660
diff --git a/miscutils/time.c b/miscutils/time.c
index b0852a0..19b0b44 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -71,7 +71,7 @@
/* Ignore signals, but don't ignore the children. When wait3
* returns the child process, set the time the command finished. */
- while ((caught = wait4(-1, &resp->waitstatus, 0, &resp->ru)) != pid) {
+ while ((caught = wait3(&resp->waitstatus, 0, &resp->ru)) != pid) {
if (caught == -1 && errno != EINTR) {
bb_perror_msg("wait");
return;