Remove special condition for block and version.

[awesomized/libmemcached] / libmemcached / server.h

diff --git a/libmemcached/server.h b/libmemcached/server.h
index c3e3672b0144d889a2c81ae9c0cae04e06c49da9..4248e143f7c47e68d0a3c6c82d0a83b2e15458a9 100644 (file)
--- a/libmemcached/server.h
+++ b/libmemcached/server.h
@@ -15,25 +15,30 @@
 
 struct memcached_server_st {
   struct {
-    bool is_allocated MEMCACHED_BITFIELD;
-    bool is_initialized MEMCACHED_BITFIELD;
-    bool sockaddr_inited MEMCACHED_BITFIELD;
-    bool is_shutting_down MEMCACHED_BITFIELD;
+    bool is_allocated:1;
+    bool is_initialized:1;
+    bool sockaddr_inited:1;
+    bool is_shutting_down:1;
   } options;
   uint32_t number_of_hosts;
   uint32_t cursor_active;
   in_port_t port;
   int cached_errno;
-  int fd;
+  memcached_socket_t fd;
   uint32_t io_bytes_sent; /* # bytes sent since last read */
   uint32_t server_failure_counter;
   uint32_t weight;
   struct { // Place any "state" sort variables in here.
-    bool is_corked;
+    bool is_corked:1;
+    bool is_dead:1;
   } state;
-  uint8_t major_version;
-  uint8_t micro_version;
-  uint8_t minor_version;
+  struct {
+    uint32_t read;
+    uint32_t write;
+  } io_wait_count;
+  uint8_t major_version; // Default definition of UINT8_MAX means that it has not been set.
+  uint8_t micro_version; // ditto
+  uint8_t minor_version; // ditto
   memcached_connection_t type;
   char *read_ptr;
   char *cached_server_error;
@@ -76,9 +81,6 @@ LIBMEMCACHED_LOCAL
 memcached_server_st *memcached_server_clone(memcached_server_st *destination,
                                             const memcached_server_st *source);
 
-LIBMEMCACHED_API
-memcached_return_t memcached_server_remove(memcached_server_st *st_ptr);
-
 LIBMEMCACHED_API
 memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *ptr);