External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-05 22:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

always compile iptables.c

Browse Source 
Avoid a build error when configuring --without-xen --without-qemu.
* src/iptables.c [WITH_QEMU]: Don't #ifdef-out.
* src/iptables.h [WITH_QEMU]: Don't #ifdef-out.
* src/util.c (virRun) [__MINGW32__]: Define a stub that always fails.
This commit is contained in:
Jim Meyering 2008-11-07 16:43:23 +00:00
parent df93e1ee24
commit 0d4cdc0569
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Thu Nov 6 20:45:42 CET 2008 Jim Meyering <meyering@redhat.com>
always compile iptables.c
Avoid a build error when configuring --without-xen --without-qemu.
* src/iptables.c [WITH_QEMU]: Don't #ifdef-out.
* src/iptables.h [WITH_QEMU]: Don't #ifdef-out.
* src/util.c (virRun) [__MINGW32__]: Define a stub that always fails.
Thu Nov 6 17:33:34 CET 2008 Daniel Veillard <veillard@redhat.com>
* src/logging.c src/logging.h proxy/Makefile.am proxy/libvirt_proxy.c

4
src/iptables.c
View File

@ -21,8 +21,6 @@
#include <config.h>
#if WITH_QEMU
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
@ -1120,5 +1118,3 @@ iptablesRemoveForwardMasquerade(iptablesContext *ctx,
{
return iptablesForwardMasquerade(ctx, network, physdev, REMOVE);
}
#endif /* WITH_QEMU */

6
src/iptables.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2007 Red Hat, Inc.
* Copyright (C) 2007, 2008 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -22,8 +22,6 @@
#ifndef __QEMUD_IPTABLES_H__
#define __QEMUD_IPTABLES_H__
#if WITH_QEMU
typedef struct _iptablesContext iptablesContext;
iptablesContext *iptablesContextNew (void);
@ -95,6 +93,4 @@ int iptablesRemoveForwardMasquerade (iptablesContext *ctx,
const char *network,
const char *physdev);
#endif /* WITH_QEMU */
#endif /* __QEMUD_IPTABLES_H__ */

12
src/util.c
View File

@ -579,6 +579,18 @@ virRun(virConnectPtr conn,
#else /* __MINGW32__ */
int
virRun(virConnectPtr conn,
const char *const *argv ATTRIBUTE_UNUSED,
int *status)
{
if (status)
*status = ENOTSUP;
else
ReportError (conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__);
return -1;
}
int
virExec(virConnectPtr conn,
const char *const*argv ATTRIBUTE_UNUSED,