diff options
-rw-r--r-- | avahi-core/Makefile.am | 2 | ||||
-rw-r--r-- | avahi-core/announce.h | 2 | ||||
-rw-r--r-- | avahi-core/browse.h | 2 | ||||
-rw-r--r-- | avahi-core/cache.h | 2 | ||||
-rw-r--r-- | avahi-core/entry.c | 2 | ||||
-rw-r--r-- | avahi-core/iface.h | 2 | ||||
-rw-r--r-- | avahi-core/internal.h (renamed from avahi-core/server.h) | 4 | ||||
-rw-r--r-- | avahi-core/multicast-lookup.c | 2 | ||||
-rw-r--r-- | avahi-core/server.c | 2 | ||||
-rw-r--r-- | avahi-core/wide-area.c | 2 | ||||
-rw-r--r-- | tests/c-plus-plus-test.cc | 5 |
11 files changed, 15 insertions, 12 deletions
diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am index 95505b8..3ecce11 100644 --- a/avahi-core/Makefile.am +++ b/avahi-core/Makefile.am @@ -48,7 +48,7 @@ noinst_PROGRAMS = \ libavahi_core_la_SOURCES = \ timeeventq.c timeeventq.h\ iface.c iface.h \ - server.c server.h entry.c \ + server.c internal.h entry.c \ prioq.c prioq.h \ cache.c cache.h \ socket.c socket.h \ diff --git a/avahi-core/announce.h b/avahi-core/announce.h index 1994312..3a8bcf3 100644 --- a/avahi-core/announce.h +++ b/avahi-core/announce.h @@ -26,7 +26,7 @@ typedef struct AvahiAnnouncer AvahiAnnouncer; #include <avahi-common/llist.h> #include "iface.h" -#include "server.h" +#include "internal.h" #include "timeeventq.h" #include "publish.h" diff --git a/avahi-core/browse.h b/avahi-core/browse.h index 61ceca7..36d4e2e 100644 --- a/avahi-core/browse.h +++ b/avahi-core/browse.h @@ -26,7 +26,7 @@ #include "core.h" #include "timeeventq.h" -#include "server.h" +#include "internal.h" #include "dns.h" #include "lookup.h" diff --git a/avahi-core/cache.h b/avahi-core/cache.h index 3d71e50..4fbc1b9 100644 --- a/avahi-core/cache.h +++ b/avahi-core/cache.h @@ -26,7 +26,7 @@ typedef struct AvahiCache AvahiCache; #include <avahi-common/llist.h> #include "prioq.h" -#include "server.h" +#include "internal.h" #include "timeeventq.h" #include "hashmap.h" diff --git a/avahi-core/entry.c b/avahi-core/entry.c index 74f44f1..fe7702e 100644 --- a/avahi-core/entry.c +++ b/avahi-core/entry.c @@ -38,7 +38,7 @@ #include <avahi-common/malloc.h> #include <avahi-common/error.h> -#include "server.h" +#include "internal.h" #include "iface.h" #include "socket.h" #include "browse.h" diff --git a/avahi-core/iface.h b/avahi-core/iface.h index 14d0195..e45ab10 100644 --- a/avahi-core/iface.h +++ b/avahi-core/iface.h @@ -30,7 +30,7 @@ typedef struct AvahiHwInterface AvahiHwInterface; #include <avahi-common/llist.h> #include <avahi-common/address.h> -#include "server.h" +#include "internal.h" #include "cache.h" #include "response-sched.h" #include "query-sched.h" diff --git a/avahi-core/server.h b/avahi-core/internal.h index 7181b3c..47a9c84 100644 --- a/avahi-core/server.h +++ b/avahi-core/internal.h @@ -1,5 +1,5 @@ -#ifndef fooserverhfoo -#define fooserverhfoo +#ifndef foointernalhfoo +#define foointernalhfoo /* $Id$ */ diff --git a/avahi-core/multicast-lookup.c b/avahi-core/multicast-lookup.c index 339215d..7ae45ea 100644 --- a/avahi-core/multicast-lookup.c +++ b/avahi-core/multicast-lookup.c @@ -26,7 +26,7 @@ #include <avahi-common/malloc.h> #include <avahi-common/timeval.h> -#include "server.h" +#include "internal.h" #include "browse.h" #include "socket.h" #include "log.h" diff --git a/avahi-core/server.c b/avahi-core/server.c index 2252fde..5651bc1 100644 --- a/avahi-core/server.c +++ b/avahi-core/server.c @@ -38,7 +38,7 @@ #include <avahi-common/malloc.h> #include <avahi-common/error.h> -#include "server.h" +#include "internal.h" #include "iface.h" #include "socket.h" #include "browse.h" diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c index f32c403..c5508b0 100644 --- a/avahi-core/wide-area.c +++ b/avahi-core/wide-area.c @@ -32,7 +32,7 @@ #include <avahi-common/error.h> #include <avahi-common/timeval.h> -#include "server.h" +#include "internal.h" #include "browse.h" #include "socket.h" #include "log.h" diff --git a/tests/c-plus-plus-test.cc b/tests/c-plus-plus-test.cc index b1b324c..fcdc7a4 100644 --- a/tests/c-plus-plus-test.cc +++ b/tests/c-plus-plus-test.cc @@ -44,11 +44,13 @@ #include <avahi-core/browse.h> #include <avahi-core/cache.h> #include <avahi-core/core.h> +#include <avahi-core/dns-srv-rr.h> #include <avahi-core/dns.h> #include <avahi-core/fdutil.h> #include <avahi-core/hashmap.h> #include <avahi-core/iface-linux.h> #include <avahi-core/iface.h> +#include <avahi-core/internal.h> #include <avahi-core/log.h> #include <avahi-core/lookup.h> #include <avahi-core/multicast-lookup.h> @@ -61,13 +63,14 @@ #include <avahi-core/response-sched.h> #include <avahi-core/rr.h> #include <avahi-core/rrlist.h> -#include <avahi-core/server.h> #include <avahi-core/socket.h> #include <avahi-core/timeeventq.h> #include <avahi-core/util.h> #include <avahi-core/wide-area.h> #include <avahi-client/client.h> #include <avahi-client/internal.h> +#include <avahi-client/lookup.h> +#include <avahi-client/publish.h> #include <avahi-glib/glib-malloc.h> #include <avahi-glib/glib-watch.h> |