First merge of Trond's patches (cherry picking).

[m6w6/libmemcached] / libmemcached / memcached.h

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 119c4607d589b1e9a3480f4c6d9240a7d872c990..39158498c1bbbe53b468eb5145c93386324cf09a 100644 (file)
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -85,8 +85,8 @@ struct memcached_st {
     bool is_initialized:1;
     bool is_purging:1;
   } options;
-  uint8_t distribution;
-  uint8_t hash;
+  memcached_server_distribution_t distribution;
+  memcached_hash_t hash;
   uint32_t continuum_points_counter;
   memcached_server_st *hosts;
   memcached_server_st *last_disconnected_server;