commit 16bd81be22ba2753e26f6a9ee6cb291e1e707d0d
author JP Abgrall <jpa@google.com> Wed May 18 23:22:23 2011 -0700
committer JP Abgrall <jpa@google.com> Thu May 19 16:32:50 2011 -0700
tree 09baffafda05b0cf9e05d8800a8f81a2397887da
parent b3d101788ebac83cdf7aa71f78069cf1af4a748d

androidifying: fixup includes and extraneous typedefs for __ANDROID__

The current could would take steps to define missing types, and include
extra stuff based on GLIBC defines/versions.
Make those places be ANDROID aware.

Change-Id: I2d1f03e3c0f7f53250288a84db4c9ccf0431d482
Signed-off-by: JP Abgrall <jpa@google.com>

libiptc/libip4tc.c

diff --git a/libiptc/libip4tc.c b/libiptc/libip4tc.c
index e2d2a5e..221f276 100644
--- a/libiptc/libip4tc.c
+++ b/libiptc/libip4tc.c
@@ -22,7 +22,7 @@
 #define inline
 #endif
 
-#if !defined(__GLIBC__) || (__GLIBC__ < 2)
+#if !defined(__ANDROID__) && (!defined(__GLIBC__) || (__GLIBC__ < 2))
 typedef unsigned int socklen_t;
 #endif
 

libiptc/libip6tc.c

diff --git a/libiptc/libip6tc.c b/libiptc/libip6tc.c
index c1508cd..e557227 100644
--- a/libiptc/libip6tc.c
+++ b/libiptc/libip6tc.c
@@ -23,7 +23,7 @@
 #define inline
 #endif
 
-#if !defined(__GLIBC__) || (__GLIBC__ < 2)
+#if !defined(__ANDROID__) && (!defined(__GLIBC__) || (__GLIBC__ < 2))
 typedef unsigned int socklen_t;
 #endif