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

[catta] / avahi-core / server.c

diff --git a/avahi-core/server.c b/avahi-core/server.c
index 4d5a4ecc798b6ba913fae6a49b6e11329a624c32..d9137385dd91fcd48b593fb7c8faf56eed8b31f4 100644 (file)
--- a/avahi-core/server.c
+++ b/avahi-core/server.c
@@ -31,8 +31,10 @@
 #include <errno.h>
 #include <stdio.h>
 
+#include <avahi-common/domain.h>
+
 #include "server.h"
-#include "util.h"
+#include "timeval.h"
 #include "iface.h"
 #include "socket.h"
 #include "browse.h"
@@ -2036,7 +2038,7 @@ void avahi_entry_group_change_state(AvahiEntryGroup *g, AvahiEntryGroupState sta
     if (g->state == state)
         return;
 
-    g_assert(state >= AVAHI_ENTRY_GROUP_UNCOMMITED && state <= AVAHI_ENTRY_GROUP_COLLISION);
+    g_assert(state <= AVAHI_ENTRY_GROUP_COLLISION);
 
     g->state = state;
     
@@ -2093,7 +2095,7 @@ void avahi_entry_group_free(AvahiEntryGroup *g) {
 static void entry_group_commit_real(AvahiEntryGroup *g) {
     g_assert(g);
 
-    g_get_current_time(&g->register_time);
+    gettimeofday(&g->register_time, NULL);
 
     avahi_entry_group_change_state(g, AVAHI_ENTRY_GROUP_REGISTERING);
 
@@ -2117,7 +2119,7 @@ static void entry_group_register_time_event_callback(AvahiTimeEvent *e, gpointer
 }
 
 gint avahi_entry_group_commit(AvahiEntryGroup *g) {
-    GTimeVal now;
+    struct timeval now;
     
     g_assert(g);
     g_assert(!g->dead);
@@ -2132,7 +2134,7 @@ gint avahi_entry_group_commit(AvahiEntryGroup *g) {
                             AVAHI_RR_HOLDOFF_MSEC_RATE_LIMIT :
                             AVAHI_RR_HOLDOFF_MSEC));
 
-    g_get_current_time(&now);
+    gettimeofday(&now, NULL);
 
     if (avahi_timeval_compare(&g->register_time, &now) <= 0) {
         /* Holdoff time passed, so let's start probing */