diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-12 01:05:29 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-05-12 01:05:29 +0000 |
commit | 8c70d1b07c755bb56b53106b4839bb5eb7a2caf7 (patch) | |
tree | 0c636a2f03b0c85331f17df8e215cae98306532a | |
parent | f4cb217984a560f0298bd97cb5c883938a9619ba (diff) | |
parent | 48f5cbdd1c52cc32b9977abe226a2888834a23a3 (diff) | |
download | platform_external_iptables-android-r-beta-3.tar.gz platform_external_iptables-android-r-beta-3.tar.bz2 platform_external_iptables-android-r-beta-3.zip |
Snap for 6484097 from 48f5cbdd1c52cc32b9977abe226a2888834a23a3 to rvc-releaseandroid-vts-11.0_r1android-r-beta-3android-r-beta-2android-cts-11.0_r1android-11.0.0_r3android-11.0.0_r2android-11.0.0_r1r-beta-2android11-tests-releaseandroid11-release
Change-Id: Ib2ed95f044551f504742e3d6acda673f83dd34e7
-rw-r--r-- | libiptc/libip4tc.c | 2 | ||||
-rw-r--r-- | libiptc/libip6tc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libiptc/libip4tc.c b/libiptc/libip4tc.c index 08147055..78a896f7 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 diff --git a/libiptc/libip6tc.c b/libiptc/libip6tc.c index 91676c4a..06cd6237 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 |