X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcommon.h;h=b46d5ba06cd3a5c22fd2ef8bcc62a4f118723c0e;hb=a7a011c2ea4a63368b3a96a332da00820ed402cb;hp=96b834632ccfaefa23d3ce5f1bd97acf1e84703d;hpb=880439e34a123924049dd67fc59a4871d679259c;p=m6w6%2Flibmemcached

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 96b83463..b46d5ba0 100644
--- 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
 
 
@@ -136,7 +136,8 @@ LIBMEMCACHED_LOCAL
 void server_list_free(memcached_st *ptr, memcached_server_st *servers);
 
 LIBMEMCACHED_LOCAL
-memcached_return memcached_key_test(const char **keys, size_t *key_length,
+memcached_return memcached_key_test(const char * const *keys, 
+                                    const size_t *key_length,
                                     size_t number_of_keys);