Avoid compile failure when HAVE_AVAHI is not defined.

* qemud/qemud.c (remoteReadConfigFile): Remove some of the
"#ifdef HAVE_AVAHI" guards around uses of mdns_name and mdns_adv.

diff --git a/ChangeLog b/ChangeLog
index b511f03677b0ce9559ecf30771b73fa2e6d865f3..810c0109a1c48b08e2b60e2355f99a3e96d51055 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec  3 20:44:01 CET 2007 Jim Meyering <meyering@redhat.com>
+
+       Avoid compile failure when HAVE_AVAHI is not defined.
+       * qemud/qemud.c (remoteReadConfigFile): Remove some of the
+       "#ifdef HAVE_AVAHI" guards around uses of mdns_name and mdns_adv.
+
 Mon Dec  3 16:15:10 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
 
        * src/util.c: Fix header files for Windows builds.

diff --git a/qemud/qemud.c b/qemud/qemud.c
index 9904e4ac1f49401fb27a5022ce3449113168580b..f88ed42cb8d5cba292c44b11291f4b20b647a1b4 100644 (file)
--- a/qemud/qemud.c
+++ b/qemud/qemud.c
@@ -77,10 +77,8 @@ static gid_t unix_sock_gid = 0; /* Only root by default */
 static int unix_sock_rw_mask = 0700; /* Allow user only */
 static int unix_sock_ro_mask = 0777; /* Allow world */
 
-#ifdef HAVE_AVAHI
 static int mdns_adv = 1;
 static char *mdns_name = NULL;
-#endif
 
 static int tls_no_verify_certificate = 0;
 static int tls_no_verify_address = 0;
@@ -1696,10 +1694,8 @@ remoteReadConfigFile (const char *filename)
         unix_sock_rw_perms = NULL;
     }
 
-#ifdef HAVE_AVAHI
     GET_CONF_INT (conf, filename, mdns_adv);
     GET_CONF_STR (conf, filename, mdns_name);
-#endif
 
     GET_CONF_INT (conf, filename, tls_no_verify_certificate);
     GET_CONF_INT (conf, filename, tls_no_verify_address);