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
/
memcached.h
diff --git
a/libmemcached/memcached.h
b/libmemcached/memcached.h
index 2b5471846500c92facd95ba2a51114da1fff4b0b..6f3b0f5d5e28f8f78984bd82320fc3343c7f41ce 100644
(file)
--- a/
libmemcached/memcached.h
+++ b/
libmemcached/memcached.h
@@
-31,8
+31,17
@@
extern "C" {
#define MEMCACHED_VERSION_STRING_LENGTH 12
/* string value */
#define MEMCACHED_VERSION_STRING_LENGTH 12
/* string value */
+<<<<<<< local
#define LIBMEMCACHED_VERSION_STRING "0.19"
#define LIBMEMCACHED_VERSION_STRING "0.19"
+struct continuum_item{
+ uint32_t index;
+ uint32_t value;
+};
+=======
+#define LIBMEMCACHED_VERSION_STRING "0.20"
+>>>>>>> other
+
struct memcached_stat_st {
uint32_t pid;
uint32_t uptime;
struct memcached_stat_st {
uint32_t pid;
uint32_t uptime;
@@
-77,6
+86,7
@@
struct memcached_st {
memcached_server_distribution distribution;
void *user_data;
unsigned int wheel[MEMCACHED_WHEEL_SIZE];
memcached_server_distribution distribution;
void *user_data;
unsigned int wheel[MEMCACHED_WHEEL_SIZE];
+ struct continuum_item continuum[MEMCACHED_CONTINUUM_SIZE];
memcached_clone_func on_clone;
memcached_cleanup_func on_cleanup;
memcached_free_function call_free;
memcached_clone_func on_clone;
memcached_cleanup_func on_cleanup;
memcached_free_function call_free;
@@
-90,6
+100,7
@@
struct memcached_st {
#endif
};
#endif
};
+
/* Public API */
const char * memcached_lib_version(void);
/* Public API */
const char * memcached_lib_version(void);