From: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Date: Sun, 6 Nov 2016 09:59:43 +0000 (+0100)
Subject: musl-compat: avoid kernel header conflicts
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6015fc07618173bc9cc44890e0f9c86081c80848;p=oweals%2Ffirewall3.git

musl-compat: avoid kernel header conflicts

The conflict between Musls net/if.h and linux/if.h is an old well known
one and taken care of by a series of linux-headers patches in OpenWrt.
Since Linux 4.8-rc5 Firewall3 also indirectly pulls in linux/in.h and
linux/in6.h leading to new conflicts.

As Firewall3 is fine with just the libc headers prevent inclusion of the
corresponding kernel headers.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
---

diff --git a/iptables.h b/iptables.h
index a2c733d..491e598 100644
--- a/iptables.h
+++ b/iptables.h
@@ -21,6 +21,9 @@
 
 #define _GNU_SOURCE /* RTLD_NEXT */
 
+#define _LINUX_IF_H
+#define _LINUX_IN_H
+#define _LINUX_IN6_H
 #include <libiptc/libiptc.h>
 #include <libiptc/libip6tc.h>
 #include <xtables.h>
diff --git a/options.h b/options.h
index 6c9c0b2..307c5af 100644
--- a/options.h
+++ b/options.h
@@ -32,6 +32,8 @@
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
+#define _LINUX_IN_H
+#define _LINUX_IN6_H
 #include <netinet/in.h>
 #include <netinet/ether.h>