time.c: tv_convex_combination() fixes.

[paraslash.git] / gcc-compat.h

diff --git a/gcc-compat.h b/gcc-compat.h
index c4e43107def98935f6ef1000a20128274a037b8e..ffd714f7c7c36a085e24d20e2ecd0a680af0406a 100644 (file)
--- a/gcc-compat.h
+++ b/gcc-compat.h
@@ -1,12 +1,12 @@
-# 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.
  */
 # define __printf(p,q) __attribute__ ((format (printf, p, q)))
 /*
@@ -16,7 +16,7 @@
 #define  __printf_1_2 __printf(1,2)
 #define  __printf_2_3 __printf(2,3)
 
-# 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 */