projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updating for merge
[m6w6/libmemcached]
/
libmemcached
/
common.h
diff --git
a/libmemcached/common.h
b/libmemcached/common.h
index 288f421d4280b83072827f59041cab5c39cff574..44e32dd84bba528bf3d83ac049a6607775d772cb 100644
(file)
--- a/
libmemcached/common.h
+++ b/
libmemcached/common.h
@@
-16,7
+16,6
@@
#include <netdb.h>
#include <unistd.h>
#include <limits.h>
#include <netdb.h>
#include <unistd.h>
#include <limits.h>
-#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/un.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)
#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))
#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
#endif
+
#ifdef HAVE_DTRACE
#define _DTRACE_VERSION 1
#else
#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);
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__ */
#endif /* __COMMON_H__ */