diff options
| author | Maciej Żenczykowski <maze@google.com> | 2020-05-09 12:23:56 -0700 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2020-05-11 01:04:22 +0200 |
| commit | 9dd0c484767c9fa3852b23c790d3d5e84e510beb (patch) | |
| tree | 42b9bcd4474635ee771e0b1ce542fd342dc9c021 | |
| parent | 9269b8fcf63d3fa8dbad4550b5ecfb7f327d1145 (diff) | |
libiptc: do not typedef socklen_t on Android
This is present in bionic header files regardless of compiler
being used (likely clang)
Test: builds
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -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 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 |