Rename some server side objects/symbols so that they do not conflict with the same...

[catta] / avahi-core / announce.h

diff --git a/avahi-core/announce.h b/avahi-core/announce.h
index 389c7ca37c4d60505750ae630ebc84d91e2ba3a5..9c01d2641a0f5191febcc9000df15c3a7b73e549 100644 (file)
--- a/avahi-core/announce.h
+++ b/avahi-core/announce.h
@@ -22,11 +22,9 @@
   USA.
 ***/
 
-#include <glib.h>
-
 typedef struct AvahiAnnouncement AvahiAnnouncement;
 
-#include "llist.h"
+#include <avahi-common/llist.h>
 #include "iface.h"
 #include "server.h"
 #include "timeeventq.h"
@@ -46,8 +44,8 @@ struct AvahiAnnouncement {
     AvahiTimeEvent *time_event;
 
     AvahiAnnouncementState state;
-    guint n_iteration;
-    guint sec_delay;
+    unsigned n_iteration;
+    unsigned sec_delay;
 
     AVAHI_LLIST_FIELDS(AvahiAnnouncement, by_interface);
     AVAHI_LLIST_FIELDS(AvahiAnnouncement, by_entry);
@@ -55,17 +53,19 @@ struct AvahiAnnouncement {
 
 void avahi_announce_interface(AvahiServer *s, AvahiInterface *i);
 void avahi_announce_entry(AvahiServer *s, AvahiEntry *e);
-void avahi_announce_group(AvahiServer *s, AvahiEntryGroup *g);
+void avahi_announce_group(AvahiServer *s, AvahiSEntryGroup *g);
+
+void avahi_entry_return_to_initial_state(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);
 
-void avahi_entry_group_check_probed(AvahiEntryGroup *g, gboolean immediately);
+void avahi_s_entry_group_check_probed(AvahiSEntryGroup *g, int immediately);
 
-gboolean avahi_entry_registered(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);
-gboolean avahi_entry_registering(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);
+int avahi_entry_is_registered(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);
+int avahi_entry_is_probing(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);
 
-void avahi_goodbye_interface(AvahiServer *s, AvahiInterface *i, gboolean send);
-void avahi_goodbye_entry(AvahiServer *s, AvahiEntry *e, gboolean send);
+void avahi_goodbye_interface(AvahiServer *s, AvahiInterface *i, int send_goodbye);
+void avahi_goodbye_entry(AvahiServer *s, AvahiEntry *e, int send_goodbye);
 
-void avahi_goodbye_all(AvahiServer *s, gboolean send);
+void avahi_goodbye_all(AvahiServer *s, int send_goodbye);
 
 AvahiAnnouncement *avahi_get_announcement(AvahiServer *s, AvahiEntry *e, AvahiInterface *i);