* Rename various data structures to prevent a namespace conflict with avahi-core

[catta] / avahi-core / resolve-host-name.c

diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
index c18722d19dc59b1b09a8749e12b34025387bfc91..f50ddb4b154b51ab918a89d9995ed8104bdeaea5 100644 (file)
--- a/avahi-core/resolve-host-name.c
+++ b/avahi-core/resolve-host-name.c
@@ -23,8 +23,9 @@
 #include <config.h>
 #endif
 
+#include <avahi-common/domain.h>
+#include "timeval.h"
 #include "browse.h"
-#include "util.h"
 
 struct AvahiHostNameResolver {
     AvahiServer *server;
@@ -107,7 +108,7 @@ static void time_event_callback(AvahiTimeEvent *e, void *userdata) {
 AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const gchar *host_name, guchar aprotocol, AvahiHostNameResolverCallback callback, gpointer userdata) {
     AvahiHostNameResolver *r;
     AvahiKey *k;
-    GTimeVal tv;
+    struct timeval tv;
     
     g_assert(server);
     g_assert(host_name);