X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=include%2Fmemcached.h;h=eddc5f3cdd0b8f0857226e69a92ca02ab4dbfa5e;hb=1993cec1176bc583cfa54d8b99a4040f5d3c24aa;hp=9a1ca327f90c8538532e88e0d1a9f176c748904f;hpb=15db4f3f26e02d62e8cd769391e73cb57089aa1c;p=awesomized%2Flibmemcached

diff --git a/include/memcached.h b/include/memcached.h
index 9a1ca327..eddc5f3c 100644
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -33,10 +33,6 @@ extern "C" {
 
 /* string value */
 #define LIBMEMCACHED_VERSION_STRING "0.14"
-/* binary values */
-#define MEMCACHED_MAJOR_VERSION 0
-#define MEMCACHED_MAJOR_VERSION 14
-#define MEMCACHED_MICRO_VERSION 0
 
 typedef enum {
   MEMCACHED_SUCCESS,
@@ -143,10 +139,10 @@ struct memcached_server_st {
   char hostname[MEMCACHED_MAX_HOST_LENGTH];
   unsigned int port;
   int fd;
+  int cached_errno;
   unsigned int cursor_active;
   char write_buffer[MEMCACHED_MAX_BUFFER];
   size_t write_buffer_offset;
-  char *write_ptr;
   char read_buffer[MEMCACHED_MAX_BUFFER];
   size_t read_data_length;
   size_t read_buffer_length;
@@ -158,6 +154,7 @@ struct memcached_server_st {
   uint8_t minor_version;
   uint8_t micro_version;
   uint16_t count;
+  memcached_st *root;
 };
 
 struct memcached_stat_st {
@@ -212,9 +209,8 @@ struct memcached_st {
   memcached_server_st *hosts;
   unsigned int number_of_hosts;
   unsigned int cursor_server;
-  char connected;
   int cached_errno;
-  unsigned long long flags;
+  uint32_t flags;
   int send_size;
   int recv_size;
   int32_t poll_timeout;
@@ -312,7 +308,8 @@ memcached_result_st *memcached_fetch_result(memcached_st *ptr,
 #define memcached_server_name(A,B) (B).hostname
 #define memcached_server_port(A,B) (B).port
 #define memcached_server_list(A) (A)->hosts
-#define memcached_server_response_count(A,B) (A)->hosts[B].cursor_active
+#define memcached_server_response_count(A) (A)->cursor_active
+
 
 memcached_return memcached_server_add_udp(memcached_st *ptr, 
                                           char *hostname,