Message ID | 20200509192356.164100-1-zenczykowski@gmail.com |
---|---|
State | Not Applicable |
Headers | show |
Series | [v2] do not typedef socklen_t on Android | expand |
On Sat, May 09, 2020 at 12:23:56PM -0700, Maciej Żenczykowski wrote: > From: Maciej Żenczykowski <maze@google.com> > > This is present in bionic header files regardless of compiler > being used (likely clang) Applied, thanks.
diff --git a/libiptc/libip4tc.c b/libiptc/libip4tc.c index 55540638..78a896f7 100644 --- a/libiptc/libip4tc.c +++ b/libiptc/libip4tc.c @@ -22,7 +22,7 @@ #define inline #endif -#if !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 b7dd1e33..06cd6237 100644 --- a/libiptc/libip6tc.c +++ b/libiptc/libip6tc.c @@ -23,7 +23,7 @@ #define inline #endif -#if !defined(__GLIBC__) || (__GLIBC__ < 2) +#if !defined(__BIONIC__) && (!defined(__GLIBC__) || (__GLIBC__ < 2)) typedef unsigned int socklen_t; #endif