fix a few more s/DBUS/D-Bus/

[catta] / avahi-common / simple-watch.h

diff --git a/avahi-common/simple-watch.h b/avahi-common/simple-watch.h
index 08335703c693ab9518a92fc8cd4bbf4cbf39aa86..7c83db39f50c424285199ddcccd9728ed39ca267 100644 (file)
--- a/avahi-common/simple-watch.h
+++ b/avahi-common/simple-watch.h
@@ -26,12 +26,9 @@
 
 #include <sys/poll.h>
 #include <avahi-common/cdecl.h>
+#include <avahi-common/watch.h>
 
-#include "watch.h"
-
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN
-#endif
 
 /** A main loop object. Main loops of this type aren't very flexible
  * since they only support a single wakeup type. Nevertheless it
@@ -85,8 +82,6 @@ int avahi_simple_poll_loop(AvahiSimplePoll *s);
 /** Wakeup the main loop. (for threaded environments) */
 void avahi_simple_poll_wakeup(AvahiSimplePoll *s);
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_END
-#endif
 
 #endif