X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2Fgccmacro.h;h=dd495022929840c112991161c24d76560f5162a9;hb=6fabf9d5189cf0efb86af1cd57e5399f8e31112a;hp=33ff847a0e71bd1c1827d2c42d7d6d5c41196063;hpb=dad41109f1726a876dd918290187d0a5296b267d;p=catta

diff --git a/avahi-common/gccmacro.h b/avahi-common/gccmacro.h
index 33ff847..dd49502 100644
--- a/avahi-common/gccmacro.h
+++ b/avahi-common/gccmacro.h
@@ -26,17 +26,20 @@
 
 #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))
-#endif
+#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 3)
+#define AVAHI_GCC_ALLOC_SIZE(x) __attribute__ ((__alloc_size__(x)))
+#define AVAHI_GCC_ALLOC_SIZE2(x,y) __attribute__ ((__alloc_size__(x,y)))
+#else
+/** Macro for usage of GCC's alloc_size attribute */
+#define AVAHI_GCC_ALLOC_SIZE(x)
+#define AVAHI_GCC_ALLOC_SIZE2(x,y)
 #endif
 
-#ifndef AVAHI_GCC_SENTINEL
+#if defined(__GNUC__) && (__GNUC__ >= 4)
+#define AVAHI_GCC_SENTINEL __attribute__ ((sentinel))
+#else
 /** Macro for usage of GCC's sentinel compilation warnings */
 #define AVAHI_GCC_SENTINEL
 #endif
@@ -61,8 +64,13 @@ AVAHI_C_DECL_BEGIN
 #define AVAHI_GCC_NORETURN
 #endif
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-AVAHI_C_DECL_END
+#ifdef __GNUC__
+#define AVAHI_GCC_UNUSED __attribute__ ((unused))
+#else
+/** Macro for not used parameter */
+#define AVAHI_GCC_UNUSED
 #endif
 
+AVAHI_C_DECL_END
+
 #endif