From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 8 May 2013 23:26:30 +0000 (-0400)
Subject: Revert "build: further fixes for broken if_bridge.h"
X-Git-Tag: v0.9.11.10~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=416fc2e4ccac6416519f68e97fe73601e1b029d3;p=thirdparty%2Flibvirt.git

Revert "build: further fixes for broken if_bridge.h"

This reverts commit d23e735fb40184a820f0103a0a69d06dc2266cc0.

Accidental double commit.
---

diff --git a/configure.ac b/configure.ac
index 9e7deba817..94395d7704 100644
--- a/configure.ac
+++ b/configure.ac
@@ -859,7 +859,7 @@ if test "$with_linux" = "yes"; then
   if test "$with_qemu" = "yes" || test "$with_lxc" = "yes" ; then
     AC_CHECK_HEADERS([linux/param.h linux/sockios.h linux/if_bridge.h linux/if_tun.h],,
       [AC_MSG_ERROR([You must install kernel-headers in order to compile libvirt with QEMU or LXC support])],
-      [[#include <netinet/in.h>
+      [[#include <netinet/ip6.h>
       ]])
   fi
 fi
diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index 1347202f64..59e57399bb 100644
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -30,8 +30,9 @@
 #include "intprops.h"
 
 #include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
+#ifdef HAVE_NET_IF_H
+# include <net/if.h>
+#endif
 #include <netinet/in.h>
 
 #ifdef __linux__