diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-08-11 23:45:42 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-08-11 23:45:42 +0000 |
| commit | e63a65b3955b173a3e8d6b78c6377a518a9922d6 (patch) | |
| tree | 9665358bbdd3c228cfeae6b3cbe27e29ac53e506 /avahi-core/server.c | |
| parent | c3d36ee186b5fb24480590080215f7e14ee0f6a6 (diff) | |
* drop glib from avahi-common
* add new module with avahi_malloc() and friends
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@298 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-core/server.c')
| -rw-r--r-- | avahi-core/server.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/avahi-core/server.c b/avahi-core/server.c index 4d5a4ec..2bbc1f0 100644 --- a/avahi-core/server.c +++ b/avahi-core/server.c @@ -2036,7 +2036,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 +2093,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 +2117,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 +2132,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 */ |