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

[catta] / avahi-core / timeeventq-test.c

diff --git a/avahi-core/timeeventq-test.c b/avahi-core/timeeventq-test.c
index 33cd2b1227acd269922a4ec7cccd3355746c7535..6ac55b8b1e9572b710073d290d1d5d1cd6a44d6b 100644 (file)
--- a/avahi-core/timeeventq-test.c
+++ b/avahi-core/timeeventq-test.c
@@ -25,13 +25,13 @@
 
 #include <glib.h>
 
-#include "util.h"
 #include "timeeventq.h"
+#include "timeval.h"
 
 static AvahiTimeEventQueue *q = NULL;
 
 static void callback(AvahiTimeEvent*e, gpointer userdata) {
-    GTimeVal tv = {0, 0};
+    struct timeval tv = {0, 0};
     g_assert(e);
     g_message("callback(%i)", GPOINTER_TO_INT(userdata));
     avahi_elapse_time(&tv, 1000, 100);
@@ -40,7 +40,7 @@ static void callback(AvahiTimeEvent*e, gpointer userdata) {
 
 int main(int argc, char *argv[]) {
     GMainLoop *loop = NULL;
-    GTimeVal tv;
+    struct timeval tv;
     
     q = avahi_time_event_queue_new(NULL, 0);