X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=avahi-core%2Fiface.h;h=cb763591fe6630367bc9f0815748d2b3f041b262;hb=7540df5ed6b383ec93f5a4f10ab2d08f9b9869e4;hp=33d20f05d6f575984905139f5d908b1ece49928c;hpb=48cfb3c876636d79dace3ebc8e82c946bc0b7ebf;p=catta

diff --git a/avahi-core/iface.h b/avahi-core/iface.h
index 33d20f0..cb76359 100644
--- a/avahi-core/iface.h
+++ b/avahi-core/iface.h
@@ -29,11 +29,11 @@ typedef struct AvahiInterfaceAddress AvahiInterfaceAddress;
 typedef struct AvahiInterface AvahiInterface;
 typedef struct AvahiHwInterface AvahiHwInterface;
 
+#include <avahi-common/llist.h>
 #include "address.h"
 #include "server.h"
 #include "netlink.h"
 #include "cache.h"
-#include "llist.h"
 #include "response-sched.h"
 #include "query-sched.h"
 #include "probe-sched.h"
@@ -112,8 +112,8 @@ void avahi_interface_monitor_free(AvahiInterfaceMonitor *m);
 
 void avahi_interface_monitor_sync(AvahiInterfaceMonitor *m);
 
-AvahiInterface* avahi_interface_monitor_get_interface(AvahiInterfaceMonitor *m, AvahiIfIndex index, AvahiProtocol protocol);
-AvahiHwInterface* avahi_interface_monitor_get_hw_interface(AvahiInterfaceMonitor *m, gint index);
+AvahiInterface* avahi_interface_monitor_get_interface(AvahiInterfaceMonitor *m, AvahiIfIndex idx, AvahiProtocol protocol);
+AvahiHwInterface* avahi_interface_monitor_get_hw_interface(AvahiInterfaceMonitor *m, gint idx);
 
 void avahi_interface_send_packet(AvahiInterface *i, AvahiDnsPacket *p);
 void avahi_interface_send_packet_unicast(AvahiInterface *i, AvahiDnsPacket *p, const AvahiAddress *a, guint16 port);
@@ -127,13 +127,13 @@ void avahi_dump_caches(AvahiInterfaceMonitor *m, AvahiDumpCallback callback, gpo
 gboolean avahi_interface_relevant(AvahiInterface *i);
 gboolean avahi_interface_address_relevant(AvahiInterfaceAddress *a);
 
-gboolean avahi_interface_match(AvahiInterface *i, AvahiIfIndex index, AvahiProtocol protocol);
+gboolean avahi_interface_match(AvahiInterface *i, AvahiIfIndex idx, AvahiProtocol protocol);
 
 typedef void (*AvahiInterfaceMonitorWalkCallback)(AvahiInterfaceMonitor *m, AvahiInterface *i, gpointer userdata);
     
-void avahi_interface_monitor_walk(AvahiInterfaceMonitor *m, AvahiIfIndex index, AvahiProtocol protocol, AvahiInterfaceMonitorWalkCallback callback, gpointer userdata);
+void avahi_interface_monitor_walk(AvahiInterfaceMonitor *m, AvahiIfIndex idx, AvahiProtocol protocol, AvahiInterfaceMonitorWalkCallback callback, gpointer userdata);
 
-void avahi_update_host_rrs(AvahiInterfaceMonitor *m, gboolean remove);
+void avahi_update_host_rrs(AvahiInterfaceMonitor *m, gboolean remove_rrs);
 
 gboolean avahi_address_is_local(AvahiInterfaceMonitor *m, const AvahiAddress *a);