27 lines
781 B
Plaintext
27 lines
781 B
Plaintext
|
<netinet/ip.h> and <linux/ip.h> redefine a couple of structs, including
|
||
|
|
iphdr. Handle this the same way as on glibc, i.e. don't include
|
||
|
|
<linux/ip.h>.
|
||
|
|
|
||
|
|
This change comes from AOSP.
|
||
|
|
|
||
|
|
Signed-off-by: Kevin Cernekee <cernekee@xxxxxxxxx>
|
||
|
|
---
|
||
|
|
include/libiptc/ipt_kernel_headers.h | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/include/libiptc/ipt_kernel_headers.h b/include/libiptc/ipt_kernel_headers.h
|
||
|
|
index 18861fe..60c7998 100644
|
||
|
|
--- a/include/libiptc/ipt_kernel_headers.h
|
||
|
|
+++ b/include/libiptc/ipt_kernel_headers.h
|
||
|
|
@@ -5,7 +5,7 @@
|
||
|
|
|
||
|
|
#include <limits.h>
|
||
|
|
|
||
|
|
-#if defined(__GLIBC__) && __GLIBC__ == 2
|
||
|
|
+#if defined(__ANDROID__) || (defined(__GLIBC__) && __GLIBC__ == 2)
|
||
|
|
#include <netinet/ip.h>
|
||
|
|
#include <netinet/in.h>
|
||
|
|
#include <netinet/ip_icmp.h>
|
||
|
|
--
|
||
|
|
1.7.9.5
|