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

[catta] / avahi-core / resolve-address.c

diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c
index 89f9bcfa64c86ead9069cf945e81da546b5bacdb..fa50c39742f72d547bac3a896c1915d03e47203c 100644 (file)
--- a/avahi-core/resolve-address.c
+++ b/avahi-core/resolve-address.c
@@ -24,7 +24,7 @@
 #endif
 
 #include "browse.h"
-#include "util.h"
+#include "timeval.h"
 
 struct AvahiAddressResolver {
     AvahiServer *server;
@@ -82,7 +82,7 @@ AvahiAddressResolver *avahi_address_resolver_new(AvahiServer *server, AvahiIfInd
     AvahiAddressResolver *r;
     AvahiKey *k;
     gchar *n;
-    GTimeVal tv;
+    struct timeval tv;
 
     g_assert(server);
     g_assert(address);