X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=9415f4321eb84d946cc27bc108a2122fde93e56e;hb=2c51ea585ccfbf3a14fed6d28f9115292ad0e6fc;hp=66f8a495aac8238152cdf37e0e17078564258ecd;hpb=8fa220229fdb895f6f07311124e9c71943fdbad4;p=m6w6%2Flibmemcached diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h index 66f8a495..9415f432 100644 --- a/libmemcached/memcached.h +++ b/libmemcached/memcached.h @@ -13,16 +13,17 @@ #ifndef __LIBMEMCACHED_MEMCACHED_H__ #define __LIBMEMCACHED_MEMCACHED_H__ -#include #include +#include +#include +#include +#include + #if !defined(__cplusplus) # include #endif -#include -#include - #include #include #include @@ -57,27 +58,27 @@ struct memcached_st { @note these are static and should not change without a call to behavior. */ struct { - bool is_purging:1; - bool is_processing_input:1; + bool is_purging MEMCACHED_BITFIELD; + bool is_processing_input MEMCACHED_BITFIELD; } state; struct { // Everything below here is pretty static. - bool auto_eject_hosts:1; - bool binary_protocol:1; - bool buffer_requests:1; - bool cork:1; - bool hash_with_prefix_key:1; - bool ketama_weighted:1; - bool no_block:1; - bool no_reply:1; - bool randomize_replica_read:1; - bool reuse_memory:1; - bool support_cas:1; - bool tcp_nodelay:1; - bool use_cache_lookups:1; - bool use_sort_hosts:1; - bool use_udp:1; - bool verify_key:1; + bool auto_eject_hosts MEMCACHED_BITFIELD; + bool binary_protocol MEMCACHED_BITFIELD; + bool buffer_requests MEMCACHED_BITFIELD; + bool cork MEMCACHED_BITFIELD; + bool hash_with_prefix_key MEMCACHED_BITFIELD; + bool ketama_weighted MEMCACHED_BITFIELD; + bool no_block MEMCACHED_BITFIELD; + bool no_reply MEMCACHED_BITFIELD; + bool randomize_replica_read MEMCACHED_BITFIELD; + bool reuse_memory MEMCACHED_BITFIELD; + bool support_cas MEMCACHED_BITFIELD; + bool tcp_nodelay MEMCACHED_BITFIELD; + bool use_cache_lookups MEMCACHED_BITFIELD; + bool use_sort_hosts MEMCACHED_BITFIELD; + bool use_udp MEMCACHED_BITFIELD; + bool verify_key MEMCACHED_BITFIELD; } flags; memcached_server_distribution_t distribution; hashkit_st hashkit; @@ -121,7 +122,7 @@ struct memcached_st { memcached_callback_st *callbacks; char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE]; struct { - bool is_allocated:1; + bool is_allocated MEMCACHED_BITFIELD; } options; }; @@ -179,7 +180,7 @@ public: } Memcached& operator=(const Memcached& source) - { + { memcached_free(this); memcached_clone(this, &source);