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

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

diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c
index ccc9a12219f426fbaa73d8720e6f6a701de3895c..7a4c601fbd65abd51412834d92fd5c73d6cc2e29 100644 (file)
--- a/avahi-core/conformance-test.c
+++ b/avahi-core/conformance-test.c
@@ -31,7 +31,6 @@
 #include <stdio.h>
 
 #include "core.h"
-#include "util.h"
 #include "alternative.h"
 #include "log.h"
 
@@ -101,8 +100,9 @@ static void server_callback(AvahiServer *s, AvahiServerState state, gpointer use
 
 int main(int argc, char *argv[]) {
     GMainLoop *loop = NULL;
+    gint error;
 
-    avahi = avahi_server_new(NULL, NULL, server_callback, NULL);
+    avahi = avahi_server_new(NULL, NULL, server_callback, NULL, &error);
     
     loop = g_main_loop_new(NULL, FALSE);
     g_timeout_add(1000*5, dump_timeout, avahi);