From: Chris Lalancette <clalance@redhat.com>
Date: Wed, 24 Feb 2010 20:45:16 +0000 (-0500)
Subject: Only build virDomainObjFormat if not building proxy.
X-Git-Tag: v0.7.7~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1204e41f01cdefbb04220f78548f8063528f9cc8;p=thirdparty%2Flibvirt.git

Only build virDomainObjFormat if not building proxy.

While building under RHEL-5, I got a compile warning because
virDomainObjFormat was defined but not used.  That came about
because in RHEL-5 we build with "#define PROXY", and
virDomainObjFormat is only used with !PROXY.  Move the
define.

Signed-off-by: Chris Lalancette <clalance@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 4ffeb8ae0c..4420445534 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5660,6 +5660,8 @@ char *virDomainDefFormat(virDomainDefPtr def,
     return NULL;
 }
 
+#ifndef PROXY
+
 static char *virDomainObjFormat(virCapsPtr caps,
                                 virDomainObjPtr obj,
                                 int flags)
@@ -5695,9 +5697,6 @@ error:
     return NULL;
 }
 
-
-#ifndef PROXY
-
 int virDomainSaveXML(const char *configDir,
                      virDomainDefPtr def,
                      const char *xml)