From: Daniel P. Berrangé <berrange@redhat.com>
Date: Thu, 25 Jan 2018 09:35:51 +0000 (+0000)
Subject: network: remove conditional declarations
X-Git-Tag: v4.1.0-rc1~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=456c04865fd7eaf79d70734f886f5d1c015d3ad5;p=thirdparty%2Flibvirt.git

network: remove conditional declarations

The networkDnsmasqConfContents() method is only used by the test suite
and that's only built with WITH_NETWORK is set. So there is no longer
any reason to conditionalize the declaration of this method.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h
index 2cf886a7e6..b70881a690 100644
--- a/src/network/bridge_driver.h
+++ b/src/network/bridge_driver.h
@@ -34,8 +34,6 @@
 int
 networkRegister(void);
 
-# if WITH_NETWORK
-
 int
 networkDnsmasqConfContents(virNetworkObjPtr obj,
                            const char *pidfile,
@@ -43,11 +41,4 @@ networkDnsmasqConfContents(virNetworkObjPtr obj,
                            dnsmasqContext *dctx,
                            dnsmasqCapsPtr caps);
 
-# else
-/* Define no-op replacements that don't drag in any link dependencies.  */
-#  define networkDnsmasqConfContents(network, pidfile, configstr, \
-                    dctx, caps) 0
-
-# endif
-
 #endif /* __VIR_NETWORK__DRIVER_H */