diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-10-17 20:20:53 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-10-17 20:20:53 +0000 |
| commit | 11fdf8612c684b0faf85781ef1b2766bf6ea1f0b (patch) | |
| tree | 4ab3dbc5756dbbea6dce71eb3974aff97dfd0402 /avahi-common | |
| parent | 3adbda2cd5be48b7c630325f0f92e315d7eb2cfb (diff) | |
* 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
Diffstat (limited to 'avahi-common')
| -rw-r--r-- | avahi-common/dbus-watch-glue.c | 4 | ||||
| -rw-r--r-- | avahi-common/simple-watch.c | 6 | ||||
| -rw-r--r-- | avahi-common/simple-watch.h | 3 | ||||
| -rw-r--r-- | avahi-common/watch.h | 4 |
4 files changed, 8 insertions, 9 deletions
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 <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 2a15c5e..3633521 100644 --- 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 0833570..5a4b37d 100644 --- 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 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 <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 |