diff --git a/include/common/ebtree.h b/include/common/ebtree.h
index 5ef965be7..b737bc915 100644
--- a/include/common/ebtree.h
+++ b/include/common/ebtree.h
@@ -329,7 +329,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 dae7bd54f..892f516e5 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