[libvirt] [PATCH 2/4] Build fix for 'bridge.c' if 'IFF_VNET_HDR' is disabled.
Daniel P. Berrange
berrange at redhat.com
Tue Feb 17 11:17:04 UTC 2009
On Mon, Feb 16, 2009 at 12:28:31PM +0100, Jim Meyering wrote:
>
> diff --git a/src/bridge.c b/src/bridge.c
> index fc11429..668dcf0 100644
> --- a/src/bridge.c
> +++ b/src/bridge.c
> @@ -454,6 +454,7 @@ brProbeVnetHdr(int tapfd)
>
> return 1;
> #else
> + (void) tapfd;
> VIR_INFO0(_("Not enabling IFF_VNET_HDR; disabled at build time"));
> return 0;
> #endif
I prefer it if we move the conditional block outside the method decl
to stub out the whole block eg
#if defined(IFF_VNET_HDR) && defined(TUNGETFEATURES) && defined(TUNGETIFF)
static int brProbeVnetHdr(int tapfd)
{
unsigned int features;
...
}
#else
static int brProbeVnetHdr(int tapfd ATTRIBUTE_UNUSED ) { return 0; }
#endif
Daniel
--
|: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
More information about the libvir-list
mailing list