X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=4ef76fd55350959f09cbeaf9077b48b029ff3f8e;hb=3107b89b4d3441929835e6f96fda841c76f704fe;hp=a79e27ed2b051ad6cec49c0e8c6e43090ae1fda1;hpb=b4de8d3fd063b9017797dd9809ab3acb8a537606;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index a79e27ed..4ef76fd5 100644
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -25,14 +25,16 @@
 
 #include <libmemcached/visibility.h>
 #include <libmemcached/memcached_configure.h>
-#include <libmemcached/memcached_constants.h>
-#include <libmemcached/memcached_types.h>
-#include <libmemcached/memcached_behavior.h>
-#include <libmemcached/memcached_get.h>
-#include <libmemcached/memcached_server.h>
-#include <libmemcached/memcached_string.h>
-#include <libmemcached/memcached_result.h>
-#include <libmemcached/memcached_storage.h>
+#include <libmemcached/constants.h>
+#include <libmemcached/types.h>
+#include <libmemcached/string.h>
+// Everything above this line must be in the order specified.
+#include <libmemcached/behavior.h>
+#include <libmemcached/callback.h>
+#include <libmemcached/get.h>
+#include <libmemcached/result.h>
+#include <libmemcached/server.h>
+#include <libmemcached/storage.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -84,8 +86,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;
@@ -99,23 +101,21 @@ struct memcached_st {
   uint32_t cursor_server;
   int cached_errno;
   struct {
+    bool auto_eject_hosts:1;
+    bool binary_protocol:1;
+    bool buffer_requests:1;
+    bool hash_with_prefix_key:1;
+    bool ketama_weighted:1;
     bool no_block:1;
-    bool tcp_nodelay:1;
+    bool no_reply:1;
+    bool randomize_replica_read:1;
     bool reuse_memory:1;
-    bool use_md5:1;
-    bool use_crc:1;
-    bool use_cache_lookups:1;
     bool support_cas:1;
-    bool buffer_requests:1;
+    bool tcp_nodelay:1;
+    bool use_cache_lookups:1;
     bool use_sort_hosts:1;
-    bool verify_key:1;
-    bool ketama_weighted:1;
-    bool binary_protocol:1;
-    bool hash_with_prefix_key:1;
-    bool no_reply:1;
     bool use_udp:1;
-    bool auto_eject_hosts:1;
-    bool randomize_replica_read:1;
+    bool verify_key:1;
   } flags;
   int32_t poll_timeout;
   int32_t connect_timeout;
@@ -126,7 +126,7 @@ struct memcached_st {
   void *user_data;
   time_t next_distribution_rebuild;
   size_t prefix_key_length;
-  memcached_hash_t hash_continuum;
+  memcached_hash_t distribution_hash;
   memcached_result_st result;
   memcached_continuum_item_st *continuum;
   memcached_clone_fn on_clone;
@@ -321,15 +321,6 @@ memcached_return_t memcached_fetch_execute(memcached_st *ptr,
                                            void *context,
                                            unsigned int number_of_callbacks);
 
-LIBMEMCACHED_API
-memcached_return_t memcached_callback_set(memcached_st *ptr,
-                                          memcached_callback_t flag,
-                                          void *data);
-LIBMEMCACHED_API
-void *memcached_callback_get(memcached_st *ptr,
-                             memcached_callback_t flag,
-                             memcached_return_t *error);
-
 LIBMEMCACHED_API
 memcached_return_t memcached_dump(memcached_st *ptr, memcached_dump_fn *function, void *context, uint32_t number_of_callbacks);