Disable sound functions when in proxy

diff --git a/ChangeLog b/ChangeLog
index 9ac8040426a2eaeb6a572171ef5c0ece8f3338c7..b1c45ec4c875b36d089d3b14474b40c7917e90fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May  7 14:49:11 EST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/xend_internal.c, src/xml.c: Disable certain sound functions
+       when built into proxy
+
 Wed May  7 18:12:11 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
        *  src/qemu_conf.c src/qemu_conf.h src/qemu_driver.c: another patch

diff --git a/src/xend_internal.c b/src/xend_internal.c
index 0817b7dee9a6a2fb7d7e335b221c5ea69cfb5e51..f9db57130cd5a765e3765e9882f87c4bdae97254 100644 (file)
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -851,6 +851,7 @@ urlencode(const char *string)
 
     return buffer;
 }
+#endif /* ! PROXY */
 
 /* Applicable sound models */
 const char *sound_models[] = { "sb16", "es1370" };
@@ -952,7 +953,6 @@ char *sound_string_to_xml(const char *sound) {
     return NULL;
 }
 
-#endif /* ! PROXY */
 
 /* PUBLIC FUNCTIONS */
 

diff --git a/src/xml.c b/src/xml.c
index e9e2e64820c9255b0da4ff3c70c6efd5a1ea55d7..94d0fd74a5a36a19bae50e83ca1585101983822e 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -290,6 +290,7 @@ virConvertCpuSet(virConnectPtr conn, const char *str, int maxcpu) {
     return (res);
 }
 
+#ifndef PROXY
 /**
  * virBuildSoundStringFromXML
  * @sound buffer to populate
@@ -361,6 +362,7 @@ char * virBuildSoundStringFromXML(virConnectPtr conn,
     free(nodes);
     return NULL;
 }
+#endif /* !PROXY */
 #endif /* WITH_XEN */
 #ifndef PROXY