[libvirt] [PATCH] Fix build on mingw

Ján Tomko jtomko at redhat.com
Thu Mar 5 12:07:02 UTC 2015


Last commit unconditionally included a linux-specific header.

Do not do that.
---
Pushed as trivial. Forgot to send the mail.

 src/util/virnetdev.c | 4 ++++
 src/util/virnetdev.h | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 36e69a3..971db43 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -47,6 +47,10 @@
 # undef HAVE_STRUCT_IFREQ
 #endif
 
+#if defined(SIOCETHTOOL) && defined(HAVE_STRUCT_IFREQ)
+# include <linux/ethtool.h>
+#endif
+
 #if HAVE_DECL_LINK_ADDR
 # include <sys/sockio.h>
 # include <net/if_dl.h>
diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
index 643479d..856127b 100644
--- a/src/util/virnetdev.h
+++ b/src/util/virnetdev.h
@@ -32,7 +32,6 @@
 # include "virpci.h"
 # include "device_conf.h"
 
-# include <linux/ethtool.h>
 # ifdef HAVE_STRUCT_IFREQ
 typedef struct ifreq virIfreq;
 # else
-- 
2.0.5




More information about the libvir-list mailing list