X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcommon.h;h=ab61a22c424a37db9263e08f11da6edbf8756ae9;hb=5ef15e8c3826baead436f0d4fe6a4889956a3124;hp=b64af72331fc94ff3fb636dbd27cb8fa12214774;hpb=8386963414b7c9d9fa5328ab1d4dd768d742ad54;p=awesomized%2Flibmemcached diff --git a/libmemcached/common.h b/libmemcached/common.h index b64af723..ab61a22c 100644 --- a/libmemcached/common.h +++ b/libmemcached/common.h @@ -39,7 +39,7 @@ #include "memcached_io.h" #include "memcached/protocol_binary.h" -#include +#include "libmemcached_config.h" #if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) @@ -52,13 +52,6 @@ #define unlikely(x) if(__builtin_expect((x), 0)) #endif - -#ifdef HAVE_DTRACE -#define _DTRACE_VERSION 1 -#else -#undef _DTRACE_VERSION -#endif - #include "libmemcached_probes.h" #define MEMCACHED_BLOCK_SIZE 1024 @@ -81,7 +74,8 @@ typedef enum { MEM_VERIFY_KEY= (1 << 10), /* 11 used for weighted ketama */ MEM_KETAMA_WEIGHTED= (1 << 11), - MEM_BINARY_PROTOCOL= (1 << 12) + MEM_BINARY_PROTOCOL= (1 << 12), + MEM_HASH_WITH_PREFIX_KEY= (1 << 13) } memcached_flags; /* Hashing algo */ @@ -124,8 +118,6 @@ memcached_return memcached_server_remove(memcached_server_st *st_ptr); extern uint64_t ntohll(uint64_t); extern uint64_t htonll(uint64_t); -void host_reset(memcached_st *ptr, memcached_server_st *host, - const char *hostname, unsigned int port, - memcached_connection type); +memcached_return memcached_purge(memcached_server_st *ptr); #endif /* __COMMON_H__ */