* do no longer include timeval.h in watch.h by default

* fix some include lines from "" to <>
* drop dbus.h from doxygen, users of our libraries shouldn't care
* other cleanups

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

diff --git a/Makefile.am b/Makefile.am
index 52f1422e120047b4c3efef375b61b6121a703a7c..d08fd8790269b908493cb2837041e9d74fcd77aa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,7 +87,6 @@ DX_INPUT = \
        $(srcdir)/avahi-glib/glib-watch.h \
        $(srcdir)/avahi-glib/glib-malloc.h \
        $(srcdir)/avahi-common/timeval.h \
-       $(srcdir)/avahi-common/dbus.h \
        $(srcdir)/avahi-qt/qt-watch.h
 
 DX_EXAMPLE_PATH = $(srcdir)/examples

diff --git a/avahi-common/dbus-watch-glue.c b/avahi-common/dbus-watch-glue.c
index 80d35f29ddef80b9783596f74ab6303321e8bf03..46fcc90978f492993bf2fbf5eebff10e4df2672f 100644 (file)
--- a/avahi-common/dbus-watch-glue.c
+++ b/avahi-common/dbus-watch-glue.c
@@ -22,8 +22,8 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include <avahi-common/malloc.h>
-
+#include "malloc.h"
+#include "timeval.h"
 #include "dbus-watch-glue.h"
 
 static AvahiWatchEvent translate_dbus_to_avahi(unsigned int f) {

diff --git a/avahi-common/simple-watch.c b/avahi-common/simple-watch.c
index 2a15c5effba9bf26a597052bf6039fb5dc7f7375..36335215088f2f0563e5e377e496cb0044010e8d 100644 (file)
--- a/avahi-common/simple-watch.c
+++ b/avahi-common/simple-watch.c
@@ -31,9 +31,9 @@
 #include <fcntl.h>
 #include <stdio.h>
 
-#include <avahi-common/llist.h>
-#include <avahi-common/malloc.h>
-
+#include "llist.h"
+#include "malloc.h"
+#include "timeval.h"
 #include "simple-watch.h"
 
 struct AvahiWatch {

diff --git a/avahi-common/simple-watch.h b/avahi-common/simple-watch.h
index 08335703c693ab9518a92fc8cd4bbf4cbf39aa86..5a4b37d05e1deca8317fc4b8481502149acbe7f0 100644 (file)
--- a/avahi-common/simple-watch.h
+++ b/avahi-common/simple-watch.h
@@ -26,8 +26,7 @@
 
 #include <sys/poll.h>
 #include <avahi-common/cdecl.h>
-
-#include "watch.h"
+#include <avahi-common/watch.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN

diff --git a/avahi-common/watch.h b/avahi-common/watch.h
index 9f82729e68c49d13a22674fe81fcfd26acc759c5..b973683c239083ca77ef12231251aebece6615e0 100644 (file)
--- a/avahi-common/watch.h
+++ b/avahi-common/watch.h
@@ -25,9 +25,9 @@
 /** \file watch.h Simplistic main loop abstraction */
 
 #include <sys/poll.h>
-#include <avahi-common/cdecl.h>
+#include <sys/time.h>
 
-#include "timeval.h"
+#include <avahi-common/cdecl.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN

diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c
index 8cf1d34853e23c641277187309d32fb4d90e8f70..94c34b9e20e30d0baeea98c4d58c3639dd2014fa 100644 (file)
--- a/avahi-core/avahi-test.c
+++ b/avahi-core/avahi-test.c
@@ -33,6 +33,8 @@
 #include <avahi-common/malloc.h>
 #include <avahi-common/simple-watch.h>
 #include <avahi-common/alternative.h>
+#include <avahi-common/timeval.h>
+
 #include <avahi-core/core.h>
 #include <avahi-core/log.h>
 #include <avahi-core/publish.h>

diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c
index b119e467fa08cab467c4e4770e989a0950ba2906..6e8e00e9183cf87a53d73b049811454ef630dfb3 100644 (file)
--- a/avahi-core/conformance-test.c
+++ b/avahi-core/conformance-test.c
@@ -34,6 +34,7 @@
 #include <avahi-common/alternative.h>
 #include <avahi-common/malloc.h>
 #include <avahi-common/simple-watch.h>
+#include <avahi-common/timeval.h>
 
 #include "core.h"
 #include "log.h"

diff --git a/avahi-core/lookup.h b/avahi-core/lookup.h
index 50f763150c725a5dadea74625298a6cbc67a2a24..153fb67b375ced0463e207ec280be065469c25bb 100644 (file)
--- a/avahi-core/lookup.h
+++ b/avahi-core/lookup.h
@@ -64,8 +64,8 @@ typedef struct AvahiSDNSServerBrowser AvahiSDNSServerBrowser;
 AVAHI_C_DECL_END
 #endif
 
-#include "core.h"
-#include "publish.h"
+#include <avahi-core/core.h>
+#include <avahi-core/publish.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN

diff --git a/avahi-core/multicast-lookup.c b/avahi-core/multicast-lookup.c
index 4ba48b4e752525b928c106277c23030921244c91..339215dde97b2699a76c960c89fb759e215e195b 100644 (file)
--- a/avahi-core/multicast-lookup.c
+++ b/avahi-core/multicast-lookup.c
@@ -24,6 +24,7 @@
 #endif
 
 #include <avahi-common/malloc.h>
+#include <avahi-common/timeval.h>
 
 #include "server.h"
 #include "browse.h"

diff --git a/avahi-core/netlink.h b/avahi-core/netlink.h
index 46d8e0bbda98d9f1d784bd79573f605148b6b5da..8f2f8cbbd93c61dd062214f03f9053d88ceec22b 100644 (file)
--- a/avahi-core/netlink.h
+++ b/avahi-core/netlink.h
@@ -24,6 +24,8 @@
 
 #include <sys/socket.h>
 #include <asm/types.h>
+#include <inttypes.h>
+
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 

diff --git a/avahi-core/publish.h b/avahi-core/publish.h
index a10a5a89098f586c552d7fed0745c87e557f6f9b..a5b302593d9586259b8c3f847342af96eb08515f 100644 (file)
--- a/avahi-core/publish.h
+++ b/avahi-core/publish.h
@@ -41,7 +41,7 @@ typedef struct AvahiSEntryGroup AvahiSEntryGroup;
 AVAHI_C_DECL_END
 #endif
 
-#include "core.h"
+#include <avahi-core/core.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN

diff --git a/avahi-core/querier-test.c b/avahi-core/querier-test.c
index 41efc2ce2ad9381e04112d348c238d5c52fdbacc..6ba33d095c71b253c25bc636b59a8aa22a0939e8 100644 (file)
--- a/avahi-core/querier-test.c
+++ b/avahi-core/querier-test.c
@@ -29,6 +29,8 @@
 #include <avahi-common/malloc.h>
 #include <avahi-common/simple-watch.h>
 #include <avahi-common/alternative.h>
+#include <avahi-common/timeval.h>
+
 #include <avahi-core/core.h>
 #include <avahi-core/log.h>
 #include <avahi-core/publish.h>

diff --git a/avahi-core/rr.h b/avahi-core/rr.h
index 6824d2a658a182088618e2f056f5bad4be58624d..7c00152d65134ad4b492937c19f071e658659ebb 100644 (file)
--- a/avahi-core/rr.h
+++ b/avahi-core/rr.h
@@ -24,13 +24,13 @@
 
 /** \file rr.h Functions and definitions for manipulating DNS resource record (RR) data. */
 
+#include <inttypes.h>
+#include <sys/types.h>
+
 #include <avahi-common/strlst.h>
 #include <avahi-common/address.h>
 #include <avahi-common/cdecl.h>
 
-#include <inttypes.h>
-#include <sys/types.h>
-
 AVAHI_C_DECL_BEGIN
 
 /** DNS record types, see RFC 1035 */

diff --git a/avahi-core/update-test.c b/avahi-core/update-test.c
index 8c5b5ed3b927eb6cbe1daf018f93e699da3fb19c..bd42c757a26b2b69f3b0a41802a8596d82eca4bc 100644 (file)
--- a/avahi-core/update-test.c
+++ b/avahi-core/update-test.c
@@ -30,6 +30,7 @@
 #include <avahi-common/simple-watch.h>
 #include <avahi-common/malloc.h>
 #include <avahi-common/alternative.h>
+#include <avahi-common/timeval.h>
 
 #include <avahi-core/core.h>
 #include <avahi-core/log.h>

diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c
index 1075084090b8aa8855e7178d0e97b5682e6dfa51..2c5f8c1285956011f9c95cae4214533984af4390 100644 (file)
--- a/avahi-core/wide-area.c
+++ b/avahi-core/wide-area.c
@@ -30,6 +30,7 @@
 
 #include <avahi-common/malloc.h>
 #include <avahi-common/error.h>
+#include <avahi-common/timeval.h>
 
 #include "server.h"
 #include "browse.h"

diff --git a/avahi-glib/glib-watch.c b/avahi-glib/glib-watch.c
index e6def467050da96cbe02bfb918cc57613261aecb..a99cb4ddecb96c6a9bb57538af00b865a2f66f5a 100644 (file)
--- a/avahi-glib/glib-watch.c
+++ b/avahi-glib/glib-watch.c
@@ -25,6 +25,7 @@
 
 #include <avahi-common/llist.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/timeval.h>
 
 #include "glib-watch.h"
 

diff --git a/avahi-qt/qt-watch.cpp b/avahi-qt/qt-watch.cpp
index 2426798a3c0d9ec47b0f362b3454bb23746165a3..5b49845e5f278da6c802f83e1c5e92085d2ee1c0 100644 (file)
--- a/avahi-qt/qt-watch.cpp
+++ b/avahi-qt/qt-watch.cpp
@@ -29,6 +29,7 @@
 #include <qobject.h>
 #include <qtimer.h>
 #endif
+#include <avahi-common/timeval.h>
 #include "qt-watch.h"
 
 class AvahiWatch : public QObject