projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge.
[awesomized/libmemcached]
/
libmemcached
/
common.h
diff --git
a/libmemcached/common.h
b/libmemcached/common.h
index 1b1b13c3c1ac4354a54a7e36def16d844ef355d5..ab61a22c424a37db9263e08f11da6edbf8756ae9 100644
(file)
--- a/
libmemcached/common.h
+++ b/
libmemcached/common.h
@@
-39,7
+39,7
@@
#include "memcached_io.h"
#include "memcached/protocol_binary.h"
#include "memcached_io.h"
#include "memcached/protocol_binary.h"
-#include
<libmemcached_config.h>
+#include
"libmemcached_config.h"
#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
#if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
@@
-52,13
+52,6
@@
#define unlikely(x) if(__builtin_expect((x), 0))
#endif
#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
#include "libmemcached_probes.h"
#define MEMCACHED_BLOCK_SIZE 1024
@@
-125,10
+118,6
@@
memcached_return memcached_server_remove(memcached_server_st *st_ptr);
extern uint64_t ntohll(uint64_t);
extern uint64_t htonll(uint64_t);
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, uint32_t weight,
- memcached_connection type);
-
memcached_return memcached_purge(memcached_server_st *ptr);
#endif /* __COMMON_H__ */
memcached_return memcached_purge(memcached_server_st *ptr);
#endif /* __COMMON_H__ */