This commit was manufactured by cvs2svn to create branch 'vserver'.

[linux-2.6.git] / include / linux / compiler-gcc3.h

diff --git a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h
index 265dad4..a6fa615 100644 (file)
--- a/include/linux/compiler-gcc3.h
+++ b/include/linux/compiler-gcc3.h
@@ -3,14 +3,14 @@
 /* These definitions are for GCC v3.x.  */
 #include <linux/compiler-gcc.h>
 
-#if __GNUC_MINOR__ >= 1  && __GNUC_MINOR__ < 4
-# define inline                __inline__ __attribute__((always_inline))
-# define __inline__    __inline__ __attribute__((always_inline))
-# define __inline      __inline__ __attribute__((always_inline))
+#if __GNUC_MINOR__ >= 1
+# define inline                inline          __attribute__((always_inline))
+# define __inline__    __inline__      __attribute__((always_inline))
+# define __inline      __inline        __attribute__((always_inline))
 #endif
 
 #if __GNUC_MINOR__ > 0
-# define __deprecated  __attribute__((deprecated))
+# define __deprecated          __attribute__((deprecated))
 #endif
 
 #if __GNUC_MINOR__ >= 3
@@ -23,5 +23,10 @@
 #define __attribute_const__    __attribute__((__const__))
 
 #if __GNUC_MINOR__ >= 1
-#define  noinline __attribute__((noinline))
+#define  noinline              __attribute__((noinline))
+#endif
+
+#if __GNUC_MINOR__ >= 4
+#define __must_check           __attribute__((warn_unused_result))
 #endif
+