From d9e075d88e7d9d82464147d8283771d709c14ef8 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 | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/shared/firewall-util.c b/src/shared/firewall-util.c

index 0d3da2e..c38f9cc 100644

--- a/src/shared/firewall-util.c

+++ b/src/shared/firewall-util.c

@@ -16,15 +16,16 @@

   You should have received a copy of the GNU Lesser General Public License

   along with systemd; If not, see <http://www.gnu.org/licenses/>.

 ***/

+#define _NET_IF_H 1

 #include <alloca.h>

 #include <arpa/inet.h>

 #include <endian.h>

 #include <errno.h>

-#include <net/if.h>

 #include <stddef.h>

 #include <string.h>

 #include <sys/socket.h>

+#include <linux/if.h>

 #include <linux/netfilter_ipv4/ip_tables.h>

 #include <linux/netfilter/nf_nat.h>

 #include <linux/netfilter/xt_addrtype.h>

-- 

2.5.0