提交 025c5df8 编写于 作者: J Jim Meyering

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.
上级 78f756e0
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> Mon Dec 3 16:15:10 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
* src/util.c: Fix header files for Windows builds. * src/util.c: Fix header files for Windows builds.
......
...@@ -77,10 +77,8 @@ static gid_t unix_sock_gid = 0; /* Only root by default */ ...@@ -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_rw_mask = 0700; /* Allow user only */
static int unix_sock_ro_mask = 0777; /* Allow world */ static int unix_sock_ro_mask = 0777; /* Allow world */
#ifdef HAVE_AVAHI
static int mdns_adv = 1; static int mdns_adv = 1;
static char *mdns_name = NULL; static char *mdns_name = NULL;
#endif
static int tls_no_verify_certificate = 0; static int tls_no_verify_certificate = 0;
static int tls_no_verify_address = 0; static int tls_no_verify_address = 0;
...@@ -1696,10 +1694,8 @@ remoteReadConfigFile (const char *filename) ...@@ -1696,10 +1694,8 @@ remoteReadConfigFile (const char *filename)
unix_sock_rw_perms = NULL; unix_sock_rw_perms = NULL;
} }
#ifdef HAVE_AVAHI
GET_CONF_INT (conf, filename, mdns_adv); GET_CONF_INT (conf, filename, mdns_adv);
GET_CONF_STR (conf, filename, mdns_name); 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_certificate);
GET_CONF_INT (conf, filename, tls_no_verify_address); GET_CONF_INT (conf, filename, tls_no_verify_address);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册