X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=6f3b0f5d5e28f8f78984bd82320fc3343c7f41ce;hb=79ad5be1d7ef80332ec9b06da733b862dc35e46f;hp=2b5471846500c92facd95ba2a51114da1fff4b0b;hpb=371a82b527a8692fcaad05994a8823776fb6efa3;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 2b547184..6f3b0f5d 100644
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -31,8 +31,17 @@ extern "C" {
 #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.20"
+>>>>>>> other
+
 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];
+  struct continuum_item continuum[MEMCACHED_CONTINUUM_SIZE];
   memcached_clone_func on_clone;
   memcached_cleanup_func on_cleanup;
   memcached_free_function call_free;
@@ -90,6 +100,7 @@ struct memcached_st {
 #endif
 };
 
+
 /* Public API */
 const char * memcached_lib_version(void);