40 lines
968 B
Plaintext
40 lines
968 B
Plaintext
|
Bionic defines socklen_t as a signed int, so redefining it as unsigned
|
||
|
|
breaks the build.
|
||
|
|
|
||
|
|
This change comes from AOSP.
|
||
|
|
|
||
|
|
Signed-off-by: Kevin Cernekee <cernekee@xxxxxxxxx>
|
||
|
|
---
|
||
|
|
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 dd59951..2b029d4 100644
|
||
|
|
--- a/libiptc/libip4tc.c
|
||
|
|
+++ b/libiptc/libip4tc.c
|
||
|
|
@@ -22,7 +22,7 @@
|
||
|
|
#define inline
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#if !defined(__GLIBC__) || (__GLIBC__ < 2)
|
||
|
|
+#if !defined(__ANDROID__) && (!defined(__GLIBC__) || (__GLIBC__ < 2))
|
||
|
|
typedef unsigned int socklen_t;
|
||
|
|
#endif
|
||
|
|
|
||
|
|
diff --git a/libiptc/libip6tc.c b/libiptc/libip6tc.c
|
||
|
|
index ca01bcb..4e47e69 100644
|
||
|
|
--- a/libiptc/libip6tc.c
|
||
|
|
+++ b/libiptc/libip6tc.c
|
||
|
|
@@ -23,7 +23,7 @@
|
||
|
|
#define inline
|
||
|
|
#endif
|
||
|
|
|
||
|
|
-#if !defined(__GLIBC__) || (__GLIBC__ < 2)
|
||
|
|
+#if !defined(__ANDROID__) && (!defined(__GLIBC__) || (__GLIBC__ < 2))
|
||
|
|
typedef unsigned int socklen_t;
|
||
|
|
#endif
|
||
|
|
|
||
|
|
--
|
||
|
|
1.7.9.5
|