Bug 855620: Re-merge changes to SCTP library update r=tuexen

netwerk/sctp/src/netinet/sctp_bsd_addr.c

@@ -49,8 +49,13 @@ __FBSDID("$FreeBSD: head/sys/netinet/sctp_bsd_addr.c 239035 2012-08-04 08:03:30Z
 #include <netinet/sctp_sysctl.h>
 #include <netinet/sctp_indata.h>
 #if !defined(__Userspace_os_Windows)
+#if defined(ANDROID)
+#include <unistd.h>
+#include <ifaddrs-android-ext.h>
+#else
 #include <sys/unistd.h>
 #endif
+#endif
 
 /* Declare all of our malloc named types */
 #ifndef __Panda__

netwerk/sctp/src/netinet/sctp_os_userspace.h

@@ -383,7 +383,7 @@ struct udphdr {
 #else /* !defined(Userspace_os_Windows) */
 #include <sys/cdefs.h> /* needed? added from old __FreeBSD__ */
 #include <sys/socket.h>
-#if defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD)
+#if defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD) || defined(ANDROID)
 #include <pthread.h>
 #endif
 typedef pthread_mutex_t userland_mutex_t;
@@ -463,7 +463,9 @@ struct sx {int dummy;};
 /* for getifaddrs */
 #include <sys/types.h>
 #if !defined(__Userspace_os_Windows)
+#if !defined(ANDROID)
 #include <ifaddrs.h>
+#endif
 
 /* for ioctl */
 #include <sys/ioctl.h>

netwerk/sctp/src/netinet/sctp_pcb.c

@@ -69,8 +69,13 @@ __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 246687 2013-02-11 21:02:49Z tuex
 #endif
 #if defined(__Userspace__)
 #if !defined(__Userspace_os_Windows)
+#if defined(ANDROID)
+#include <unistd.h>
+#include <ifaddrs-android-ext.h>
+#else
 #include <sys/unistd.h>
 #endif
+#endif
 #include <user_socketvar.h>
 #endif
 

netwerk/sctp/src/user_environment.c

@@ -34,8 +34,10 @@
 #if !defined (__Userspace_os_Windows)
 #include <stdint.h>
 #if !defined(__Userspace_os_FreeBSD)
+#if !defined(ANDROID)
 #include <sys/sysctl.h>
 #endif
+#endif
 #include <netinet/sctp_os_userspace.h>
 #endif
 #include <user_environment.h>

netwerk/sctp/src/user_inpcb.h

@@ -35,6 +35,13 @@
 
 #include <user_route.h> /* was <net/route.h> */
 
+#if defined(ANDROID)
+#include <arpa/inet.h>
+#include <netinet/in.h>
+/* missing defines in Android bionic libc/NDK */
+typedef uint16_t                in_port_t;
+#endif
+
 #define	in6pcb		inpcb	/* for KAME src sync over BSD*'s */
 #define	in6p_sp		inp_sp	/* for KAME src sync over BSD*'s */
 struct inpcbpolicy;

netwerk/sctp/src/user_socketvar.h

@@ -37,6 +37,11 @@
 #include <sys/types.h>
 #include <unistd.h>
 #endif
+#if defined(ANDROID)
+/* Android bionic libc is missing some defines in sys/types.h. Pick them
+ * up elsewhere */
+#include <linux/coda.h>
+#endif
 
 /* #include <sys/selinfo.h> */ /*__Userspace__ alternative?*/	/* for struct selinfo */
 /* #include <sys/_lock.h>  was 0 byte file */