* many trivial fix to make avahi compile on OpenBSD

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@903 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-common/address.c b/avahi-common/address.c
index 640aa06f028a504ae915ef58630f2d85c8a7eac7..c8ddf7fd72975e88b5d75130e9a2a477fb0eddf1 100644 (file)
--- a/avahi-common/address.c
+++ b/avahi-common/address.c
@@ -23,8 +23,8 @@
 #include <config.h>
 #endif
 
-#include <netinet/in.h>
 #include <sys/types.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <string.h>

diff --git a/avahi-core/addr-util.c b/avahi-core/addr-util.c
index 7b9bb0368657053aa9750ecc3b17e07e59cdb6be..9e2d1e940b266359618e52d1a7d35f286573c855 100644 (file)
--- a/avahi-core/addr-util.c
+++ b/avahi-core/addr-util.c
@@ -23,8 +23,8 @@
 #include <config.h>
 #endif
 
-#include <netinet/in.h>
 #include <sys/types.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <string.h>

diff --git a/avahi-core/avahi-reflector.c b/avahi-core/avahi-reflector.c
index a383965b9f00b52daa6b7e479513e9d1d4b6321d..df5539fafe942c4f4ccb227ba5b5daeb412a75e4 100644 (file)
--- a/avahi-core/avahi-reflector.c
+++ b/avahi-core/avahi-reflector.c
@@ -23,10 +23,12 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
+
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <stdlib.h>
 
 #include <avahi-common/simple-watch.h>
 #include <avahi-core/core.h>

diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c
index 9123bfeed9eefc8beb65a361b8bdb9e6a2a84bbb..f540cf4bffe494ce6b35884370bbdce3c4da3937 100644 (file)
--- a/avahi-core/avahi-test.c
+++ b/avahi-core/avahi-test.c
@@ -23,13 +23,15 @@
 #include <config.h>
 #endif
 
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
 #include <avahi-common/malloc.h>
 #include <avahi-common/simple-watch.h>
 #include <avahi-common/alternative.h>

diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c
index 6873b5cda1a9b7cb4f3ddae69457abc3891db457..3c4ce6ed1b82ebedfbb34d0de5b86a966c1c05e3 100644 (file)
--- a/avahi-core/conformance-test.c
+++ b/avahi-core/conformance-test.c
@@ -23,14 +23,16 @@
 #include <config.h>
 #endif
 
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <assert.h>
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
 #include <avahi-common/alternative.h>
 #include <avahi-common/malloc.h>
 #include <avahi-common/simple-watch.h>

diff --git a/avahi-core/dns-test.c b/avahi-core/dns-test.c
index 8a7586cacdf5098b4c5e5a4031223a032a6d8437..ae2343d96288a41eae8f82059489a7c4360d698f 100644 (file)
--- a/avahi-core/dns-test.c
+++ b/avahi-core/dns-test.c
@@ -24,6 +24,7 @@
 #endif
 
 #include <assert.h>
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

diff --git a/avahi-core/dns.c b/avahi-core/dns.c
index b91ccd0b84dd671eeb0eb413d4fba1f63e11dac7..66b0bdf8c01e1bfdd57c74823181855bb9af9e7e 100644 (file)
--- a/avahi-core/dns.c
+++ b/avahi-core/dns.c
@@ -23,13 +23,13 @@
 #include <config.h>
 #endif
 
-#include <netinet/in.h>
-
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <assert.h>
 
+#include <netinet/in.h>
+
 #include <avahi-common/defs.h>
 #include <avahi-common/domain.h>
 #include <avahi-common/malloc.h>

diff --git a/avahi-core/entry.c b/avahi-core/entry.c
index 3621fe3c5368e2a80bc748ef97a9c705d709066a..855e22840ce6024498a3ee25afaa9fcf4aa3c8a7 100644 (file)
--- a/avahi-core/entry.c
+++ b/avahi-core/entry.c
@@ -23,16 +23,19 @@
 #include <config.h>
 #endif
 
-#include <sys/socket.h>
-#include <arpa/inet.h>
 #include <string.h>
-#include <sys/utsname.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
 
+#include <arpa/inet.h>
+
+#include <sys/utsname.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
 #include <avahi-common/domain.h>
 #include <avahi-common/timeval.h>
 #include <avahi-common/malloc.h>

diff --git a/avahi-core/iface-pfroute.c b/avahi-core/iface-pfroute.c
index a7ecdc95c57e010f12c7640a4153176b92724aa5..c573075847e33a3c542f322c4a888bff44c37d20 100644 (file)
--- a/avahi-core/iface-pfroute.c
+++ b/avahi-core/iface-pfroute.c
@@ -119,7 +119,7 @@ static void rtm_addr(struct rt_msghdr *rtm, AvahiInterfaceMonitor *m)
   int prefixlen = 0;
   struct sockaddr *sa  =NULL;
 
-#ifdef __NetBSD__  
+#if defined(__NetBSD__) || defined(__OpenBSD__)
   if(((struct sockaddr *)cp)->sa_family == AF_UNSPEC)
     ((struct sockaddr *)cp)->sa_family = AF_INET;
 #endif

diff --git a/avahi-core/iface.c b/avahi-core/iface.c
index 7afd2513f472d9a10e9a9fc691c336ca287c71a3..6a92b8e64638567dc5fdb39a9e9b95ecc205be39 100644 (file)
--- a/avahi-core/iface.c
+++ b/avahi-core/iface.c
@@ -24,11 +24,13 @@
 #endif
 
 #include <string.h>
-#include <sys/socket.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <sys/types.h>
+#include <sys/socket.h>
+
 #include <avahi-common/error.h>
 #include <avahi-common/malloc.h>
 #include <avahi-common/domain.h>

diff --git a/avahi-core/iface.h b/avahi-core/iface.h
index 167175342ea25fe449dc5f4b10bf59192ea2dcc4..24da316679bf3e961406e82daa4052a3fcefb837 100644 (file)
--- a/avahi-core/iface.h
+++ b/avahi-core/iface.h
@@ -45,7 +45,17 @@ typedef struct AvahiHwInterface AvahiHwInterface;
 #elif defined(HAVE_PF_ROUTE)
 #include "iface-pfroute.h"
 #else
-#error "No network configuration notification system available"
+typedef struct AvahiInterfaceMonitorOSDep AvahiInterfaceMonitorOSDep;
+struct AvahiInterfaceMonitorOSDep {
+        
+    unsigned query_addr_seq, query_link_seq;
+    
+    enum {
+        LIST_IFACE,
+        LIST_ADDR,
+        LIST_DONE
+    } list;
+};
 #endif
 
 #define AVAHI_MAC_ADDRESS_MAX 32

diff --git a/avahi-core/socket.c b/avahi-core/socket.c
index 0487023dd9f68bb4106672cf1f6874fb77e5be60..a73bee86d65050490b596a548cfa4bde7c5e499a 100644 (file)
--- a/avahi-core/socket.c
+++ b/avahi-core/socket.c
@@ -27,9 +27,6 @@
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/time.h>
@@ -37,6 +34,12 @@
 #include <sys/ioctl.h>
 #include <assert.h>
 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <sys/uio.h>
+
 #ifdef IP_RECVIF
 #include <net/if_dl.h>
 #endif

diff --git a/bootstrap.sh b/bootstrap.sh
index 987e36b018a27f4126999a28adc2a76a86377197..ecc8f7c6787db44bab11389a36b9f4004323ee78 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -55,7 +55,7 @@ case "$USER" in
     FLAGS="$FLAGS --disable-monodoc"
     ;;
     sebest)
-    FLAGS="$FLAGS --disable-monodoc --disable-mono --disable-qt3 --disable-qt4"
+    FLAGS="$FLAGS --disable-monodoc --disable-mono --disable-qt3 --disable-qt4 --sysconfdir=/etc --localstatedir=/var --prefix=/usr"
     ;;
 esac