projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
tests: fix skip condition for CAS test
[m6w6/libmemcached]
/
libmemcached-1.0
/
struct
/
memcached.h
diff --git
a/libmemcached-1.0/struct/memcached.h
b/libmemcached-1.0/struct/memcached.h
index 63b07a00e80a8b3b6219524515e6ef756a51ac94..a368bfe8a06e9fe56f7de27ac4ea378aca1b0f06 100644
(file)
--- 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 is_purging:1;
bool is_processing_input:1;
bool is_time_for_rebuild:1;
- bool
not_used
:1;
+ bool
is_parsing
:1;
} state;
struct {
} state;
struct {
@@
-74,16
+74,12
@@
struct memcached_st {
unsigned int version;
} server_info;
uint32_t number_of_hosts;
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;
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;
uint32_t io_msg_watermark;
uint32_t io_bytes_watermark;
uint32_t io_key_prefetch;