59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead.
|
|
|
|
--- include/libiptc/ipt_kernel_headers.h 2015-09-01 01:31:15.000000000 +0200
|
|
+++ include/libiptc/ipt_kernel_headers.h 2015-09-14 16:27:41.185174892 +0200
|
|
@@ -15,12 +15,10 @@
|
|
#else /* libc5 */
|
|
#include <sys/socket.h>
|
|
#include <linux/ip.h>
|
|
-#include <linux/in.h>
|
|
#include <linux/if.h>
|
|
#include <linux/icmp.h>
|
|
#include <linux/tcp.h>
|
|
#include <linux/udp.h>
|
|
#include <linux/types.h>
|
|
-#include <linux/in6.h>
|
|
#endif
|
|
#endif
|
|
--- include/linux/if_bridge.h 2015-09-01 01:31:15.000000000 +0200
|
|
+++ include/linux/if_bridge.h 2015-09-14 16:23:24.472434012 +0200
|
|
@@ -15,7 +15,6 @@
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/if_ether.h>
|
|
-#include <linux/in6.h>
|
|
|
|
#define SYSFS_BRIDGE_ATTR "bridge"
|
|
#define SYSFS_BRIDGE_FDB "brforward"
|
|
--- include/linux/netfilter.h 2015-09-01 01:31:15.000000000 +0200
|
|
+++ include/linux/netfilter.h 2015-09-14 16:27:34.928205553 +0200
|
|
@@ -4,8 +4,6 @@
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/sysctl.h>
|
|
-#include <linux/in.h>
|
|
-#include <linux/in6.h>
|
|
|
|
/* Responses from hook functions. */
|
|
#define NF_DROP 0
|
|
--- include/linux/xfrm.h 2015-09-01 01:31:15.000000000 +0200
|
|
+++ include/linux/xfrm.h 2015-09-14 16:23:24.473434008 +0200
|
|
@@ -1,7 +1,6 @@
|
|
#ifndef _LINUX_XFRM_H
|
|
#define _LINUX_XFRM_H
|
|
|
|
-#include <linux/in6.h>
|
|
#include <linux/types.h>
|
|
|
|
/* All of the structures in this file may not change size as they are
|
|
--- include/utils.h 2015-09-01 01:31:15.000000000 +0200
|
|
+++ include/utils.h 2015-09-14 16:23:24.472434012 +0200
|
|
@@ -1,6 +1,7 @@
|
|
#ifndef __UTILS_H__
|
|
#define __UTILS_H__ 1
|
|
|
|
+#include <sys/param.h> /* MAXPATHLEN */
|
|
#include <sys/types.h>
|
|
#include <asm/types.h>
|
|
#include <resolv.h>
|