X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gcc-compat.h;h=61c3c88d1c4551a965aaa22c626ddf8fabec31ba;hp=985ebd23eac586c83f230404ed72782855b5333c;hb=8221397af24a2df3c2edbc889847ce0ab15eb3e0;hpb=b517a66f86d3d4d27bbe48d790e46126b08c1c82

diff --git a/gcc-compat.h b/gcc-compat.h
index 985ebd23..61c3c88d 100644
--- a/gcc-compat.h
+++ b/gcc-compat.h
@@ -1,10 +1,7 @@
-#if __GNUC__ >= 3
 # define inline		inline __attribute__ ((always_inline))
 # define __noreturn	__attribute__ ((noreturn))
 # define __malloc	__attribute__ ((malloc))
-# define __used		__attribute__ ((used))
 # define __a_unused	__attribute__ ((unused))
-# define __packed	__attribute__ ((packed))
 # define likely(x)	__builtin_expect (!!(x), 1)
 # define unlikely(x)	__builtin_expect (!!(x), 0)
 /* 
@@ -19,23 +16,10 @@
 #define  __printf_1_2 __printf(1,2)
 #define  __printf_2_3 __printf(2,3)
 
-#else
-
-# define inline		/* no inline */
-# define __noreturn	/* no noreturn */
-# define __malloc	/* no malloc */
-# define __used		/* no used */
-# define __a_unused	/* no unused */
-# define __packed	/* no packed */
-# define likely(x)	(x)
-# define unlikely(x)	(x)
-# define __printf(p,q) /* no format */
-#define  __printf_1_2
-#define  __printf_2_3
-#endif
-
-# if __GNUC__ >=3 && __GNUC_MINOR__ > 3
+# if __GNUC__ > 3  || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
 # define __must_check	__attribute__ ((warn_unused_result))
 # else
 # define __must_check	/* no warn_unused_result */
 # endif
+
+#define _static_inline_ static inline