diff --git a/include/common/ebtree.h b/include/common/ebtree.h
index 1a5ce8650..38cd0b533 100644
--- a/include/common/ebtree.h
+++ b/include/common/ebtree.h
@@ -322,7 +322,7 @@ static inline int fls64(unsigned long long x)
  * only work with ints and booleans though.
  */
 #define likely(x) (x)
-#define unlikely(x) (__builtin_expect((x), 0))
+#define unlikely(x) (__builtin_expect((unsigned long)(x), 0))
 #endif
 #endif
 
diff --git a/include/common/standard.h b/include/common/standard.h
index a120f56bd..2a2c8f66c 100644
--- a/include/common/standard.h
+++ b/include/common/standard.h
@@ -61,7 +61,7 @@
  * only work with ints and booleans though.
  */
 #define likely(x) (x)
-#define unlikely(x) (__builtin_expect((x), 0))
+#define unlikely(x) (__builtin_expect((unsigned long)(x), 0))
 #endif
 #endif