X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gcc-compat.h;h=729e3ae1656deec60e6cafa37877db823e3c4852;hp=c4e43107def98935f6ef1000a20128274a037b8e;hb=5e8d8a8eea6de9459ebdf4498f9f061c84bfa63a;hpb=cf1e416e5db97f1673521a63dacaa1487fb875d7

diff --git a/gcc-compat.h b/gcc-compat.h
index c4e43107..729e3ae1 100644
--- a/gcc-compat.h
+++ b/gcc-compat.h
@@ -1,25 +1,25 @@
-# define inline		inline __attribute__ ((always_inline))
-# define __noreturn	__attribute__ ((noreturn))
-# define __malloc	__attribute__ ((malloc))
-# define __a_unused	__attribute__ ((unused))
-# define likely(x)	__builtin_expect (!!(x), 1)
-# define unlikely(x)	__builtin_expect (!!(x), 0)
-/* 
- * p is the number of the "format string" parameter, and q is 
- * the number of the first variadic parameter 
+#define inline inline __attribute__ ((always_inline))
+#define __noreturn __attribute__ ((noreturn))
+#define __malloc __attribute__ ((malloc))
+#define __a_unused __attribute__ ((unused))
+#define __a_aligned(alignment) __attribute__((__aligned__(alignment)))
+
+/*
+ * p is the number of the "format string" parameter, and q is the number of the
+ * first variadic parameter. If q is specified as zero, the compiler only
+ * checks the format string for consistency.
  */
 # define __printf(p,q) __attribute__ ((format (printf, p, q)))
+# define __a_const __attribute__ ((const))
+
 /*
- * 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.
+ * As direct use of __printf(p,q) confuses doxygen, here are some extra macros
+ * for those values p,q that are actually used.
  */
-#define  __printf_1_2 __printf(1,2)
-#define  __printf_2_3 __printf(2,3)
-
-# if __GNUC__ >=3 && __GNUC_MINOR__ > 3
-# define __must_check	__attribute__ ((warn_unused_result))
-# else
-# define __must_check	/* no warn_unused_result */
-# endif
+#define __printf_2_0 __printf(2,0)
+#define __printf_1_2 __printf(1,2)
+#define __printf_2_3 __printf(2,3)
+#define __printf_3_4 __printf(3,4)
 
+#define __must_check __attribute__ ((warn_unused_result))
 #define _static_inline_ static inline