Update

[l4.git] / kernel / fiasco / src / lib / libk / std_macros.cpp

diff --git a/kernel/fiasco/src/lib/libk/std_macros.cpp b/kernel/fiasco/src/lib/libk/std_macros.cpp
index 709d532dfc2192ee658f1b07ed94bff49576ba64..e0531e4ddf7f6f8481a6a385f81bb988519cdbec 100644 (file)
--- a/kernel/fiasco/src/lib/libk/std_macros.cpp
+++ b/kernel/fiasco/src/lib/libk/std_macros.cpp
@@ -1,14 +1,8 @@
 INTERFACE:
 
-#if (__GNUC__>=3)
-#  define BUILTIN_EXPECT(exp,c)        __builtin_expect((exp),(c))
-#  define EXPECT_TRUE(exp)     __builtin_expect((exp),true)
-#  define EXPECT_FALSE(exp)    __builtin_expect((exp),false)
-#else
-#  define BUILTIN_EXPECT(exp,c)        (exp)
-#  define EXPECT_TRUE(exp)     (exp)
-#  define EXPECT_FALSE(exp)    (exp)
-#endif
+#define BUILTIN_EXPECT(exp,c)  __builtin_expect((exp),(c))
+#define EXPECT_TRUE(exp)       __builtin_expect((exp),true)
+#define EXPECT_FALSE(exp)      __builtin_expect((exp),false)
 
 // Use this for functions which do not examine any values except their
 // arguments and have no effects except the return value. Note that a
@@ -24,17 +18,10 @@ INTERFACE:
 #define FIASCO_FASTCALL
 #endif
 
-#if (__GNUC__<3)
-# define MARK_AS_DEPRECATED    /* empty */
-# define ALWAYS_INLINE         /* empty */
-# define FIASCO_NOINLINE
-# define FIASCO_WARN_RESULT
-#else
-# define MARK_AS_DEPRECATED    __attribute__ ((__deprecated__))
-# define ALWAYS_INLINE         __attribute__ ((__always_inline__))
-# define FIASCO_NOINLINE        __attribute__ ((__noinline__))
-# define FIASCO_WARN_RESULT     __attribute__ ((warn_unused_result))
-#endif
+#define MARK_AS_DEPRECATED     __attribute__ ((__deprecated__))
+#define ALWAYS_INLINE          __attribute__ ((__always_inline__))
+#define FIASCO_NOINLINE        __attribute__ ((__noinline__))
+#define FIASCO_WARN_RESULT     __attribute__ ((warn_unused_result))
 
 #define FIASCO_NORETURN         __attribute__ ((__noreturn__))
 #define FIASCO_FLATTEN          __attribute__((__flatten__))