X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.h;h=9e468038f64912a5ed202687d977749dda4383c4;hb=ea47169abd0793bb7eb1b72e4de411ae9b43dce4;hp=76400ee3838026c75a3a9babf95bdb6ea0a5db75;hpb=284978b1dc258cb8cd2a32d6a0f25f2f9b284149;p=m6w6%2Flibmemcached diff --git a/libmemcached/server.h b/libmemcached/server.h index 76400ee3..9e468038 100644 --- a/libmemcached/server.h +++ b/libmemcached/server.h @@ -15,9 +15,10 @@ struct memcached_server_st { struct { - bool is_allocated:1; - bool is_initialized:1; - bool sockaddr_inited:1; + bool is_allocated MEMCACHED_BITFIELD; + bool is_initialized MEMCACHED_BITFIELD; + bool sockaddr_inited MEMCACHED_BITFIELD; + bool is_shutting_down MEMCACHED_BITFIELD; } options; uint32_t number_of_hosts; uint32_t cursor_active; @@ -45,7 +46,7 @@ struct memcached_server_st { uint64_t limit_maxbytes; char read_buffer[MEMCACHED_MAX_BUFFER]; char write_buffer[MEMCACHED_MAX_BUFFER]; - char hostname[MEMCACHED_MAX_HOST_LENGTH]; + char hostname[NI_MAXHOST]; }; @@ -144,17 +145,11 @@ memcached_server_st *memcached_server_list_append_with_weight(memcached_server_s LIBMEMCACHED_API unsigned int memcached_server_list_count(memcached_server_st *ptr); -// Local Only Inline -static inline uint32_t memcached_servers_count(memcached_server_st *servers) -{ - return servers->number_of_hosts; -} - -// Local Only Inline -static inline uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count) -{ - return servers->number_of_hosts= count; -} +LIBMEMCACHED_API +uint32_t memcached_servers_count(memcached_server_st *servers); + +LIBMEMCACHED_LOCAL +uint32_t memcached_servers_set_count(memcached_server_st *servers, uint32_t count); #define memcached_server_count(A) (A)->number_of_hosts