External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-12 07:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: fix build on Cygwin

Browse Source 
The RPC fixups needed on Linux are also needed on cygwin, and
worked without further tweaking to the list of fixups.  Also,
unlike BSD, Cygwin exports 'struct ifreq', but unlike Linux,
Cygwin lacks the ioctls that we were using 'struct ifreq' to
access.  This patch allows compilation under cygwin.

* src/rpc/genprotocol.pl: Also perform fixups on cygwin.
* src/util/virnetdev.c (HAVE_STRUCT_IFREQ): Also require AF_PACKET
definition.
* src/util/virnetdevbridge.c (virNetDevSetupControlFull): Only
compile if SIOCBRADDBR works.
This commit is contained in:
Eric Blake 2011-06-13 17:50:09 -06:00
parent 75da320087
commit c74a2a03f0
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpc/genprotocol.pl
View File

@ -31,7 +31,7 @@ open RPCGEN, "-|", $rpcgen, $mode, $xdrdef
open TARGET, ">$target" open TARGET, ">$target"
or die "cannot create $target: $!"; or die "cannot create $target: $!";
my $fixup = $^O eq "linux"; my $fixup = $^O eq "linux" || $^O eq "cygwin";
if ($mode eq "-c") { if ($mode eq "-c") {
print TARGET "#include <config.h>\n"; print TARGET "#include <config.h>\n";

2
src/util/virnetdev.c
View File

@ -38,6 +38,8 @@
#ifdef __linux__ #ifdef __linux__
# include <linux/sockios.h> # include <linux/sockios.h>
# include <linux/if_vlan.h> # include <linux/if_vlan.h>
#elif !defined(AF_PACKET)
# undef HAVE_STRUCT_IFREQ
#endif #endif
#define VIR_FROM_THIS VIR_FROM_NONE #define VIR_FROM_THIS VIR_FROM_NONE

2
src/util/virnetdevbridge.c
View File

@ -45,7 +45,7 @@
#define VIR_FROM_THIS VIR_FROM_NONE #define VIR_FROM_THIS VIR_FROM_NONE
#ifdef HAVE_NET_IF_H #if defined(HAVE_NET_IF_H) && defined(SIOCBRADDBR)
static int virNetDevSetupControlFull(const char *ifname, static int virNetDevSetupControlFull(const char *ifname,
struct ifreq *ifr, struct ifreq *ifr,
int domain, int domain,