Skip to contentSkip to conversation

do not typedef socklen_t on Android

PATCH Applied Maciej Żenczykowski 2 participants 2 messages May 9, 2020 – May 10, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 do not typedef socklen_t on Android

From: Maciej Żenczykowski <[email protected]>

This is present in bionic header files regardless of compiler being used (likely clang)

Test: builds

---
 libiptc/libip4tc.c | 2 +-
 libiptc/libip6tc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
libiptc/libip4tc.c +1 -1
index 55540638..78a896f7 100644
@@ -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
 
libiptc/libip6tc.c +1 -1
index b7dd1e33..06cd6237 100644
@@ -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
 
Signature · 1 line
2.26.2.645.ge9eca65c58-goog
maintainer Applied
#1 lore raw
Quoted 4 lines · Maciej Żenczykowski

From: Maciej Żenczykowski <[email protected]>

This is present in bionic header files regardless of compiler being used (likely clang)

Applied, thanks.