Merge for version.

[awesomized/libmemcached] / libmemcached-1.0 / struct / memcached.h

diff --git a/libmemcached-1.0/struct/memcached.h b/libmemcached-1.0/struct/memcached.h
index 152f310330c8402428df3500a5a39731372c2269..a3f9d279306d9e8a705f9163f2de611a5e6d3bff 100644 (file)
--- a/libmemcached-1.0/struct/memcached.h
+++ b/libmemcached-1.0/struct/memcached.h
@@ -54,7 +54,7 @@ struct memcached_st {
     bool buffer_requests:1;
     bool hash_with_namespace:1;
     bool no_block:1; // Don't block
-    bool no_reply:1;
+    bool reply:1;
     bool randomize_replica_read:1;
     bool support_cas:1;
     bool tcp_nodelay:1;
@@ -82,6 +82,7 @@ struct memcached_st {
   int32_t poll_timeout;
   int32_t connect_timeout; // How long we will wait on connect() before we will timeout
   int32_t retry_timeout;
+  int32_t dead_timeout;
   int send_size;
   int recv_size;
   void *user_data;