klibc/compiler.h: booleanize likely/unlikely

__likely() and __unlikely() should explicitly booleanize their
arguments.

diff --git a/com32/include/klibc/compiler.h b/com32/include/klibc/compiler.h
index 9f5d36e..984071f 100644 (file)
--- a/com32/include/klibc/compiler.h
+++ b/com32/include/klibc/compiler.h
@@ -94,11 +94,11 @@
 
 /* likely/unlikely */
 #if defined(__GNUC__) && (__GNUC_MAJOR__ > 2 || (__GNUC_MAJOR__ == 2 && __GNUC_MINOR__ >= 95))
-# define __likely(x)   __builtin_expect((x), 1)
-# define __unlikely(x) __builtin_expect((x), 0)
+# define __likely(x)   __builtin_expect(!!(x), 1)
+# define __unlikely(x) __builtin_expect(!!(x), 0)
 #else
-# define __likely(x)   (x)
-# define __unlikely(x) (x)
+# define __likely(x)   (!!(x))
+# define __unlikely(x) (!!(x))
 #endif
 
 /* Possibly unused function */