Avoid gratuitous conflicts when used with kernel headers

diff --git a/include/features.h b/include/features.h
index 2ab3b6b15806d5829ce4e5b0f0cdcba7ff7ac1ff..b378d316171cbe9f2df46a61f3f919007cc3b009 100644 (file)
--- a/include/features.h
+++ b/include/features.h
@@ -421,8 +421,12 @@ uClibc was built without large file support enabled.
 #if __GNUC__ == 2 && __GNUC_MINOR__ < 96
 #define __builtin_expect(x, expected_value) (x)
 #endif
-#define likely(x)      __builtin_expect((!!(x)),1)
-#define unlikely(x)    __builtin_expect((!!(x)),0)
+#ifndef likely
+# define likely(x)     __builtin_expect((!!(x)),1)
+#endif
+#ifndef unlikely
+# define unlikely(x)   __builtin_expect((!!(x)),0)
+#endif
 
 /* --- this is added to integrate linuxthreads */
 #define __USE_UNIX98            1