Pārlūkot izejas kodu

Avoid gratuitous conflicts when used with kernel headers

Eric Andersen 21 gadi atpakaļ
vecāks
revīzija
113471cb0b
1 mainītis faili ar 6 papildinājumiem un 2 dzēšanām
  1. 6 2
      include/features.h

+ 6 - 2
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