Repo created
This commit is contained in:
parent
51cf8bb4f9
commit
ee0cddf35c
548 changed files with 93129 additions and 2 deletions
32
external/dist/iptables-patches/0003-android-Don-t-include-conflicting-headers.patch
vendored
Normal file
32
external/dist/iptables-patches/0003-android-Don-t-include-conflicting-headers.patch
vendored
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
From 2f7755e416c284c3fd96248fcb5401c46a3ba6bf Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Cernekee <cernekee@gmail.com>
|
||||
Date: Sat, 26 Oct 2013 10:42:55 -0700
|
||||
Subject: [PATCH 3/7] android: Don't include conflicting headers
|
||||
|
||||
<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@gmail.com>
|
||||
---
|
||||
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
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue