X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2Fsimple-watch.h;h=72c1905bcb4f02b746587a6f487b517265f44c5a;hb=2aa610ca9e872c18937c298d1d52dea20702176d;hp=08335703c693ab9518a92fc8cd4bbf4cbf39aa86;hpb=d3e893754d3158b72d488e515535dfcac980e1c3;p=catta

diff --git a/avahi-common/simple-watch.h b/avahi-common/simple-watch.h
index 0833570..72c1905 100644
--- a/avahi-common/simple-watch.h
+++ b/avahi-common/simple-watch.h
@@ -1,21 +1,19 @@
 #ifndef foosimplewatchhfoo
 #define foosimplewatchhfoo
 
-/* $Id$ */
-
 /***
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   avahi is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
   Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with avahi; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -26,12 +24,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 +80,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