X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcommon.h;h=44e32dd84bba528bf3d83ac049a6607775d772cb;hb=08094800b6370a9a9f28e3e429aa5d616b39388e;hp=288f421d4280b83072827f59041cab5c39cff574;hpb=1d6e6af8afc6a08163160d8107276cac79688751;p=m6w6%2Flibmemcached

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 288f421d..44e32dd8 100644
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -16,7 +16,6 @@
 #include <netdb.h>
 #include <unistd.h>
 #include <limits.h>
-#include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/un.h>
@@ -41,18 +40,17 @@
 #include <libmemcached_config.h>
 
 #if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
-#define __builtin_expect(x, expected_value) (x)
-
-#define likely(x)       __builtin_expect((x),1)
-#define unlikely(x)     __builtin_expect((x),0)
-
-#else
 
 #define likely(x)       if((x))
 #define unlikely(x)     if((x))
 
+#else
+
+#define likely(x)       if(__builtin_expect(!!(x), 1))
+#define unlikely(x)     if(__builtin_expect((x), 0))
 #endif
 
+
 #ifdef HAVE_DTRACE
 #define _DTRACE_VERSION 1
 #else
@@ -110,4 +108,7 @@ void server_list_free(memcached_st *ptr, memcached_server_st *servers);
 memcached_return memcachd_key_test(char **keys, size_t *key_length,
                                    unsigned int number_of_keys);
 
+void sort_hosts(memcached_st *ptr);
+
+uint32_t generate_hash(memcached_st *ptr, char *key, size_t key_length);
 #endif /* __COMMON_H__ */