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 99c942d8cf6f3a3e8ecda4028192637a94050738..6f3b0f5d5e28f8f78984bd82320fc3343c7f41ce 100644
(file)
--- a/
libmemcached/memcached.h
+++ b/
libmemcached/memcached.h
@@
-31,12
+31,16
@@
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"
struct continuum_item{
uint32_t index;
uint32_t value;
};
#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;
struct memcached_stat_st {
uint32_t pid;