X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached-1.0%2Fstruct%2Fmemcached.h;h=a368bfe8a06e9fe56f7de27ac4ea378aca1b0f06;hb=22da6f6d6410053ac1f4682453b52463e6c9a05f;hp=0b4f89763adb20298997bd31903b615552709ae7;hpb=cc47230b8dfe0bcd31d4f45ca84d2dd35ae360f0;p=awesomized%2Flibmemcached

diff --git a/libmemcached-1.0/struct/memcached.h b/libmemcached-1.0/struct/memcached.h
index 0b4f8976..a368bfe8 100644
--- a/libmemcached-1.0/struct/memcached.h
+++ b/libmemcached-1.0/struct/memcached.h
@@ -45,7 +45,7 @@ struct memcached_st {
     bool is_purging:1;
     bool is_processing_input:1;
     bool is_time_for_rebuild:1;
-    bool not_used:1;
+    bool is_parsing:1;
   } state;
 
   struct {
@@ -74,16 +74,12 @@ struct memcached_st {
     unsigned int version;
   } server_info;
   uint32_t number_of_hosts;
-#ifdef __cplusplus
-  org::libmemcached::Instance* servers;
-  org::libmemcached::Instance* last_disconnected_server;
-#else
-  void *servers;
-  void *last_disconnected_server;
-#endif
+  memcached_instance_st *servers;
+  memcached_instance_st *last_disconnected_server;
   int32_t snd_timeout;
   int32_t rcv_timeout;
   uint32_t server_failure_limit;
+  uint32_t server_timeout_limit;
   uint32_t io_msg_watermark;
   uint32_t io_bytes_watermark;
   uint32_t io_key_prefetch;
@@ -100,11 +96,11 @@ struct memcached_st {
   memcached_result_st result;
 
   struct {
-    bool weighted;
+    bool weighted_;
     uint32_t continuum_count; // Ketama
     uint32_t continuum_points_counter; // Ketama
     time_t next_distribution_rebuild; // Ketama
-    memcached_continuum_item_st *continuum; // Ketama
+    struct memcached_continuum_item_st *continuum; // Ketama
   } ketama;
 
   struct memcached_virtual_bucket_t *virtual_bucket;