From 11fdf8612c684b0faf85781ef1b2766bf6ea1f0b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 17 Oct 2005 20:20:53 +0000 Subject: [PATCH] * 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 --- Makefile.am | 1 - avahi-common/dbus-watch-glue.c | 4 ++-- avahi-common/simple-watch.c | 6 +++--- avahi-common/simple-watch.h | 3 +-- avahi-common/watch.h | 4 ++-- avahi-core/avahi-test.c | 2 ++ avahi-core/conformance-test.c | 1 + avahi-core/lookup.h | 4 ++-- avahi-core/multicast-lookup.c | 1 + avahi-core/netlink.h | 2 ++ avahi-core/publish.h | 2 +- avahi-core/querier-test.c | 2 ++ avahi-core/rr.h | 6 +++--- avahi-core/update-test.c | 1 + avahi-core/wide-area.c | 1 + avahi-glib/glib-watch.c | 1 + avahi-qt/qt-watch.cpp | 1 + 17 files changed, 26 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index 52f1422..d08fd87 100644 --- 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 80d35f2..46fcc90 100644 --- a/avahi-common/dbus-watch-glue.c +++ b/avahi-common/dbus-watch-glue.c @@ -22,8 +22,8 @@ #include #include -#include - +#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 2a15c5e..3633521 100644 --- a/avahi-common/simple-watch.c +++ b/avahi-common/simple-watch.c @@ -31,9 +31,9 @@ #include #include -#include -#include - +#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 0833570..5a4b37d 100644 --- a/avahi-common/simple-watch.h +++ b/avahi-common/simple-watch.h @@ -26,8 +26,7 @@ #include #include - -#include "watch.h" +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS AVAHI_C_DECL_BEGIN diff --git a/avahi-common/watch.h b/avahi-common/watch.h index 9f82729..b973683 100644 --- a/avahi-common/watch.h +++ b/avahi-common/watch.h @@ -25,9 +25,9 @@ /** \file watch.h Simplistic main loop abstraction */ #include -#include +#include -#include "timeval.h" +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS AVAHI_C_DECL_BEGIN diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c index 8cf1d34..94c34b9 100644 --- a/avahi-core/avahi-test.c +++ b/avahi-core/avahi-test.c @@ -33,6 +33,8 @@ #include #include #include +#include + #include #include #include diff --git a/avahi-core/conformance-test.c b/avahi-core/conformance-test.c index b119e46..6e8e00e 100644 --- a/avahi-core/conformance-test.c +++ b/avahi-core/conformance-test.c @@ -34,6 +34,7 @@ #include #include #include +#include #include "core.h" #include "log.h" diff --git a/avahi-core/lookup.h b/avahi-core/lookup.h index 50f7631..153fb67 100644 --- 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 +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS AVAHI_C_DECL_BEGIN diff --git a/avahi-core/multicast-lookup.c b/avahi-core/multicast-lookup.c index 4ba48b4..339215d 100644 --- a/avahi-core/multicast-lookup.c +++ b/avahi-core/multicast-lookup.c @@ -24,6 +24,7 @@ #endif #include +#include #include "server.h" #include "browse.h" diff --git a/avahi-core/netlink.h b/avahi-core/netlink.h index 46d8e0b..8f2f8cb 100644 --- a/avahi-core/netlink.h +++ b/avahi-core/netlink.h @@ -24,6 +24,8 @@ #include #include +#include + #include #include diff --git a/avahi-core/publish.h b/avahi-core/publish.h index a10a5a8..a5b3025 100644 --- 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 #ifndef DOXYGEN_SHOULD_SKIP_THIS AVAHI_C_DECL_BEGIN diff --git a/avahi-core/querier-test.c b/avahi-core/querier-test.c index 41efc2c..6ba33d0 100644 --- a/avahi-core/querier-test.c +++ b/avahi-core/querier-test.c @@ -29,6 +29,8 @@ #include #include #include +#include + #include #include #include diff --git a/avahi-core/rr.h b/avahi-core/rr.h index 6824d2a..7c00152 100644 --- 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 +#include + #include #include #include -#include -#include - 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 8c5b5ed..bd42c75 100644 --- a/avahi-core/update-test.c +++ b/avahi-core/update-test.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c index 1075084..2c5f8c1 100644 --- a/avahi-core/wide-area.c +++ b/avahi-core/wide-area.c @@ -30,6 +30,7 @@ #include #include +#include #include "server.h" #include "browse.h" diff --git a/avahi-glib/glib-watch.c b/avahi-glib/glib-watch.c index e6def46..a99cb4d 100644 --- a/avahi-glib/glib-watch.c +++ b/avahi-glib/glib-watch.c @@ -25,6 +25,7 @@ #include #include +#include #include "glib-watch.h" diff --git a/avahi-qt/qt-watch.cpp b/avahi-qt/qt-watch.cpp index 2426798..5b49845 100644 --- a/avahi-qt/qt-watch.cpp +++ b/avahi-qt/qt-watch.cpp @@ -29,6 +29,7 @@ #include #include #endif +#include #include "qt-watch.h" class AvahiWatch : public QObject -- 2.39.2