Trond's fix for Mark's build issue

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 30fc4e12a9fbfb6203075b55b948dcd4af523b3d..b46d5ba06cd3a5c22fd2ef8bcc62a4f118723c0e 100644 (file)
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -64,8 +64,8 @@ struct memcached_continuum_item_st {
 
 #else
 
-#define likely(x)       if(__builtin_expect(!!(x), 1))
-#define unlikely(x)     if(__builtin_expect((x), 0))
+#define likely(x)       if(__builtin_expect((x) != 0, 1))
+#define unlikely(x)     if(__builtin_expect((x) != 0, 0))
 #endif