* [PATCH v2] do not typedef socklen_t on Android
@ 2020-05-09 19:23 Maciej Żenczykowski
2020-05-10 23:03 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Maciej Żenczykowski @ 2020-05-09 19:23 UTC (permalink / raw)
To: Maciej Żenczykowski, Pablo Neira Ayuso, Florian Westphal
Cc: Linux Network Development Mailing List,
Netfilter Development Mailing List
From: Maciej Żenczykowski <maze@google.com>
This is present in bionic header files regardless of compiler
being used (likely clang)
Test: builds
Signed-off-by: Maciej Żenczykowski <maze@google.com>
---
libiptc/libip4tc.c | 2 +-
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
--
2.26.2.645.ge9eca65c58-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-10 23:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-09 19:23 [PATCH v2] do not typedef socklen_t on Android Maciej Żenczykowski
2020-05-10 23:03 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).