From 113471cb0bd16e03864a58983468ce8091fbecc3 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 22 Aug 2003 20:28:43 +0000 Subject: Avoid gratuitous conflicts when used with kernel headers --- include/features.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'include/features.h') diff --git a/include/features.h b/include/features.h index 2ab3b6b15..b378d3161 100644 --- 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 -- cgit v1.2.3