diff options
| author | Eric Andersen <andersen@codepoet.org> | 2003-08-22 20:28:43 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2003-08-22 20:28:43 +0000 |
| commit | 113471cb0bd16e03864a58983468ce8091fbecc3 (patch) | |
| tree | 9d1cec31b47d32548a9fb7509bdba8f6b8a890d3 /include | |
| parent | 88352870e9c7417c1659f8621bbd5ec38c8a67cb (diff) | |
Avoid gratuitous conflicts when used with kernel headers
Diffstat (limited to 'include')
| -rw-r--r-- | include/features.h | 8 |
1 files changed, 6 insertions, 2 deletions
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 |