* rename all limit defs so that they end with _MAX

[catta] / avahi-core / iface.h

diff --git a/avahi-core/iface.h b/avahi-core/iface.h
index d9f9cba77d1ba7696bfecd80ac4a4d88f7d9f7a1..167175342ea25fe449dc5f4b10bf59192ea2dcc4 100644 (file)
--- 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"
@@ -39,9 +39,16 @@ typedef struct AvahiHwInterface AvahiHwInterface;
 #include "announce.h"
 #include "browse.h"
 #include "querier.h"
+
+#ifdef HAVE_NETLINK
 #include "iface-linux.h"
+#elif defined(HAVE_PF_ROUTE)
+#include "iface-pfroute.h"
+#else
+#error "No network configuration notification system available"
+#endif
 
-#define AVAHI_MAX_MAC_ADDRESS 32
+#define AVAHI_MAC_ADDRESS_MAX 32
 
 struct AvahiInterfaceMonitor {
     AvahiServer *server;
@@ -65,7 +72,7 @@ struct AvahiHwInterface {
     
     unsigned mtu;
 
-    uint8_t mac_address[AVAHI_MAX_MAC_ADDRESS];
+    uint8_t mac_address[AVAHI_MAC_ADDRESS_MAX];
     size_t mac_address_size;
 
     AvahiSEntryGroup *entry_group;
@@ -90,7 +97,7 @@ struct AvahiInterface {
     AvahiProbeScheduler *probe_scheduler;
 
     AVAHI_LLIST_HEAD(AvahiInterfaceAddress, addresses);
-    AVAHI_LLIST_HEAD(AvahiAnnouncement, announcements);
+    AVAHI_LLIST_HEAD(AvahiAnnouncer, announcers);
 
     AvahiHashmap *queriers_by_key;
     AVAHI_LLIST_HEAD(AvahiQuerier, queriers);