commit abe911e5f6b601bf99d9d4c32c7e0743441874e5
author Treehugger Robot <treehugger-gerrit@google.com> Mon May 11 20:28:34 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 11 20:28:34 2020 +0000
tree 0c636a2f03b0c85331f17df8e215cae98306532a
parent e6cb0500d462d8016fe2c903c85ca74dedf8588f
parent 914d414ffabdcaf21db7bcb8188c308c7d7b4bde

Merge "use __BIONIC__ not __ANDROID__"

libiptc/libip4tc.c

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

libiptc/libip6tc.c

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