X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fcommon.h;h=095b7f5e27e52172b309bb607f97069067d5c402;hb=8ce1a267a6593221cdd887643517364694ea985f;hp=ff54fe5738179c1a066ded2f826e4360698bee73;hpb=8c6442357f4685e75c8b6a851404d9b8f7079ef1;p=awesomized%2Flibmemcached

diff --git a/lib/common.h b/lib/common.h
index ff54fe57..095b7f5e 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -21,7 +21,6 @@
 #include <fcntl.h>
 #include <sys/un.h>
 #include <netinet/tcp.h>
-#include <libmemcached_config.h>
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -41,6 +40,19 @@
 
 #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))
+
+#endif
+
 #ifdef HAVE_DTRACE
 #define _DTRACE_VERSION 1
 #else
@@ -66,6 +78,7 @@ typedef enum {
   MEM_SUPPORT_CAS= (1 << 7),
   MEM_BUFFER_REQUESTS= (1 << 8),
   MEM_USE_SORT_HOSTS= (1 << 9),
+  MEM_VERIFY_KEY= (1 << 10),
 } memcached_flags;
 
 /* Hashing algo */
@@ -111,13 +124,7 @@ memcached_return value_fetch(memcached_server_st *ptr,
                              memcached_result_st *result);
 void server_list_free(memcached_st *ptr, memcached_server_st *servers);
 
-memcached_return key_proof(char **keys, size_t *key_length, 
-                           unsigned int number_of_keys);
-
-#ifdef HAVE_DEBUG
-#define key_test(A,B,C) key_proof(A,B,C)
-#else
-#define key_test(A,B,C) MEMCACHED_SUCCESS
-#endif
+memcached_return memcachd_key_test(char **keys, size_t *key_length, 
+                                   unsigned int number_of_keys);
 
 #endif /* __COMMON_H__ */