X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=3a1def4845086c06f57fcc57485762aebbf66fa5;hb=fe8ad508b0fec5ca6860b3fa5d10727250e3b1d4;hp=6f3b0f5d5e28f8f78984bd82320fc3343c7f41ce;hpb=d48f4bbb5d5bee5ab3bed6f479558ef1fa74b58f;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 6f3b0f5d..3a1def48 100644
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -31,16 +31,12 @@ 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;
+struct memcached_continuum_item_st {
+  uint32_t index;
+  uint32_t value;
 };
-=======
+
 #define LIBMEMCACHED_VERSION_STRING "0.20"
->>>>>>> other
 
 struct memcached_stat_st {
   uint32_t pid;
@@ -85,8 +81,10 @@ struct memcached_st {
   memcached_hash hash;
   memcached_server_distribution distribution;
   void *user_data;
-  unsigned int wheel[MEMCACHED_WHEEL_SIZE];
-  struct continuum_item continuum[MEMCACHED_CONTINUUM_SIZE];
+  unsigned int *wheel;
+  uint32_t wheel_count;
+  uint32_t continuum_count;
+  memcached_continuum_item_st *continuum;
   memcached_clone_func on_clone;
   memcached_cleanup_func on_cleanup;
   memcached_free_function call_free;
@@ -185,10 +183,9 @@ memcached_return memcached_delete_by_key(memcached_st *ptr,
                                          time_t expiration);
 
 memcached_return memcached_fetch_execute(memcached_st *ptr, 
-                                             unsigned int (*callback[])(memcached_st *ptr, memcached_result_st *result, void *context),
+                                             memcached_execute_function *callback,
                                              void *context,
-                                             unsigned int number_of_callbacks
-                                             );
+                                             unsigned int number_of_callbacks);
 
 memcached_return memcached_callback_set(memcached_st *ptr, 
                                         memcached_callback flag,