Add patch to fix {net,linux}/if.h conflict

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-02-10 15:05:03 -05:00
parent 4df4d1391d
commit ebd481af7f
2 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,32 @@
From ee3b68041ed9cf19b3dd18c4d1bb342abec7d2ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 9 Feb 2016 15:13:33 -0500
Subject: [PATCH] Add a workaround for {linux/net}/if.h conflict
Include linux/if.h and make sure we don't include the other file.
https://bugzilla.redhat.com/show_bug.cgi?id=1300256
---
src/shared/firewall-util.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/shared/firewall-util.c b/src/shared/firewall-util.c
index 5acfb0191b..95335498ef 100644
--- a/src/shared/firewall-util.c
+++ b/src/shared/firewall-util.c
@@ -19,9 +19,11 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#define _NET_IF_H 1
+
#include <arpa/inet.h>
-#include <net/if.h>
#include <sys/types.h>
+#include <linux/if.h>
#include <linux/netfilter_ipv4/ip_tables.h>
#include <linux/netfilter/nf_nat.h>
#include <linux/netfilter/xt_addrtype.h>
--
1.9.2.649.g5ae4ba5

View File

@ -39,6 +39,8 @@ Patch0002: 0002-lz4-fix-size-check-which-had-no-chance-of-working-on.patch
Patch0003: 0003-tests-fix-newlines-in-skip-message.patch Patch0003: 0003-tests-fix-newlines-in-skip-message.patch
Patch0004: 0004-core-Do-not-bind-a-mount-unit-to-a-device-if-it-was-.patch Patch0004: 0004-core-Do-not-bind-a-mount-unit-to-a-device-if-it-was-.patch
Patch0999: 0999-Add-a-workaround-for-linux-net-if.h-conflict.patch
# kernel-install patch for grubby, drop if grubby is obsolete # kernel-install patch for grubby, drop if grubby is obsolete
Patch1000: kernel-install-grubby.patch Patch1000: kernel-install-grubby.patch