Fix build with latest AOSP.
Obviously this isn't pretty and needs to be addressed...
diff --git a/Android.mk b/Android.mk
index 3b00884..2995f57 100644
--- a/Android.mk
+++ b/Android.mk
@@ -109,7 +109,9 @@
BUSYBOX_C_INCLUDES = \
$(BB_PATH)/include-$(BUSYBOX_CONFIG) \
$(BB_PATH)/include $(BB_PATH)/libbb \
+ bionic/libc \
bionic/libc/private \
+ bionic/libc/dns/include \
bionic/libm/include \
bionic/libm \
libc/kernel/common \
diff --git a/android/librpc/pmap_rmt.c b/android/librpc/pmap_rmt.c
index 68089ae..d6e576e 100644
--- a/android/librpc/pmap_rmt.c
+++ b/android/librpc/pmap_rmt.c
@@ -60,7 +60,7 @@
#define MAX_BROADCAST_SIZE 1400
#ifdef ANDROID
-static struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host)
+struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host)
{
struct in_addr a;
@@ -75,7 +75,7 @@
a.s_addr = htonl(a.s_addr);
return a;
}
-static in_addr_t inet_netof(struct in_addr in)
+in_addr_t inet_netof(struct in_addr in)
{
in_addr_t i = ntohl(in.s_addr);
diff --git a/miscutils/time.c b/miscutils/time.c
index 19b0b44..b0852a0 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 = wait3(&resp->waitstatus, 0, &resp->ru)) != pid) {
+ while ((caught = wait4(-1, &resp->waitstatus, 0, &resp->ru)) != pid) {
if (caught == -1 && errno != EINTR) {
bb_perror_msg("wait");
return;
diff --git a/networking/interface.c b/networking/interface.c
index 9ae8b3f..00c27b9 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -55,7 +55,7 @@
#define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
#ifdef HAVE_AFINET6
-# ifndef _LINUX_IN6_H
+#ifndef _UAPI_IPV6_H
/*
* This is from linux/include/net/ipv6.h
*/
@@ -64,7 +64,7 @@
uint32_t ifr6_prefixlen;
unsigned int ifr6_ifindex;
};
-# endif
+#endif
#endif /* HAVE_AFINET6 */
/* Defines for glibc2.0 users. */
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 62e2c6e..2c57237 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -33,7 +33,7 @@
# ifdef ENABLE_FEATURE_IPV6
# include <netinet/in6.h>
# endif
-# include <arpa_nameser.h>
+# include <arpa/nameser.h>
# include <resolv_private.h>
# include <resolv.h>
# undef _res
@@ -135,7 +135,7 @@
sa = (struct sockaddr*)_res._u._ext.nsaddrs[0];
if (!sa)
#endif
- sa = (struct sockaddr*)&_res.nsaddr_list[0];
+ //sa = (struct sockaddr*)&_res.nsaddr_list[0];
server = xmalloc_sockaddr2dotted_noport(sa);
print_host(server, "Server:");
@@ -154,9 +154,9 @@
lsa = xhost2sockaddr(server, 53);
if (lsa->u.sa.sa_family == AF_INET) {
- _res.nscount = 1;
+ //_res.nscount = 1;
/* struct copy */
- _res.nsaddr_list[0] = lsa->u.sin;
+ //_res.nsaddr_list[0] = lsa->u.sin;
}
#if ENABLE_FEATURE_IPV6 && !defined(__BIONIC__)
/* Hoped libc can cope with IPv4 address there too.