Merge branch 'refs/heads/t/ls-incomplete-duration'

[dss.git] / gcc-compat.h

diff --git a/gcc-compat.h b/gcc-compat.h
index 61c3c88d1c4551a965aaa22c626ddf8fabec31ba..258a3cb279b7e9045da566a17f9f7d8f52f6b40d 100644 (file)
--- a/gcc-compat.h
+++ b/gcc-compat.h
@@ -1,25 +1,27 @@
-# define inline                inline __attribute__ ((always_inline))
-# define __noreturn    __attribute__ ((noreturn))
+#define HAVE_GNUC(maj, min) \
+       defined(__GNUC__) && \
+       (__GNUC__ > maj || (__GNUC__ == maj && __GNUC_MINOR__ >= min))
+
+#if HAVE_GNUC(3,0)
 # define __malloc      __attribute__ ((malloc))
-# define __a_unused    __attribute__ ((unused))
-# define likely(x)     __builtin_expect (!!(x), 1)
-# define unlikely(x)   __builtin_expect (!!(x), 0)
+#else
+# define __malloc
+#endif
+
 /* 
  * p is the number of the "format string" parameter, and q is 
  * the number of the first variadic parameter 
  */
+#if HAVE_GNUC(2,3)
 # define __printf(p,q) __attribute__ ((format (printf, p, q)))
-/*
- * as direct use of __printf(p,q) confuses doxygen, here are two extra macros
- * for those values p,q that are actually used by paraslash.
- */
+#else
+# define __printf(p,q)
+#endif
+
 #define  __printf_1_2 __printf(1,2)
-#define  __printf_2_3 __printf(2,3)
 
-# if __GNUC__ > 3  || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
+#if HAVE_GNUC(3,3)
 # define __must_check  __attribute__ ((warn_unused_result))
-# else
+#else
 # define __must_check  /* no warn_unused_result */
-# endif
-
-#define _static_inline_ static inline
+#endif