* remove AVAHI_PUBLISH_IS_PROXY, it was a bad idea

[catta] / avahi-common / gccmacro.h

diff --git a/avahi-common/gccmacro.h b/avahi-common/gccmacro.h
index 2ac6c1d811c79377562dd5a3a6ba6606cbeea3da..33ff847a0e71bd1c1827d2c42d7d6d5c41196063 100644 (file)
--- a/avahi-common/gccmacro.h
+++ b/avahi-common/gccmacro.h
@@ -24,9 +24,19 @@
 
 /** \file gccmacro.h Defines some macros for GCC extensions */
 
+#include <avahi-common/cdecl.h>
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+AVAHI_C_DECL_BEGIN
+#endif
+
 #ifdef __GNUC__
+#if __GNUC__ >= 4
 #define AVAHI_GCC_SENTINEL __attribute__ ((sentinel))
-#else
+#endif
+#endif
+
+#ifndef AVAHI_GCC_SENTINEL
 /** Macro for usage of GCC's sentinel compilation warnings */
 #define AVAHI_GCC_SENTINEL
 #endif
@@ -51,4 +61,8 @@
 #define AVAHI_GCC_NORETURN
 #endif
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+AVAHI_C_DECL_END
+#endif
+
 #endif