Fix build for non-sasl-enabled builds

[awesomized/libmemcached] / libmemcached / memcached.h

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 32879c9fb84a0a278b08b53ea8e19e6664b1b6b6..5aca6db122074ed962cd7b53362f8c7d7489bd7a 100644 (file)
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -48,37 +48,39 @@
 #include <libmemcached/quit.h>
 #include <libmemcached/result.h>
 #include <libmemcached/server.h>
+#include <libmemcached/server_list.h>
 #include <libmemcached/storage.h>
 #include <libmemcached/strerror.h>
 #include <libmemcached/verbosity.h>
 #include <libmemcached/version.h>
+#include <libmemcached/sasl.h>
 
 struct memcached_st {
   /**
     @note these are static and should not change without a call to behavior.
   */
   struct {
-    bool is_purging:1;
-    bool is_processing_input:1;
+    bool is_purging MEMCACHED_BITFIELD;
+    bool is_processing_input MEMCACHED_BITFIELD;
   } state;
   struct {
     // Everything below here is pretty static.
-    bool auto_eject_hosts:1;
-    bool binary_protocol:1;
-    bool buffer_requests:1;
-    bool cork:1;
-    bool hash_with_prefix_key:1;
-    bool ketama_weighted:1;
-    bool no_block:1;
-    bool no_reply:1;
-    bool randomize_replica_read:1;
-    bool reuse_memory:1;
-    bool support_cas:1;
-    bool tcp_nodelay:1;
-    bool use_cache_lookups:1;
-    bool use_sort_hosts:1;
-    bool use_udp:1;
-    bool verify_key:1;
+    bool auto_eject_hosts MEMCACHED_BITFIELD;
+    bool binary_protocol MEMCACHED_BITFIELD;
+    bool buffer_requests MEMCACHED_BITFIELD;
+    bool cork MEMCACHED_BITFIELD;
+    bool hash_with_prefix_key MEMCACHED_BITFIELD;
+    bool ketama_weighted MEMCACHED_BITFIELD;
+    bool no_block MEMCACHED_BITFIELD;
+    bool no_reply MEMCACHED_BITFIELD;
+    bool randomize_replica_read MEMCACHED_BITFIELD;
+    bool reuse_memory MEMCACHED_BITFIELD;
+    bool support_cas MEMCACHED_BITFIELD;
+    bool tcp_nodelay MEMCACHED_BITFIELD;
+    bool use_cache_lookups MEMCACHED_BITFIELD;
+    bool use_sort_hosts MEMCACHED_BITFIELD;
+    bool use_udp MEMCACHED_BITFIELD;
+    bool verify_key MEMCACHED_BITFIELD;
   } flags;
   memcached_server_distribution_t distribution;
   hashkit_st hashkit;
@@ -120,9 +122,20 @@ struct memcached_st {
   memcached_trigger_key_fn get_key_failure;
   memcached_trigger_delete_key_fn delete_trigger;
   memcached_callback_st *callbacks;
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
+  struct {
+    const sasl_callback_t *callbacks;
+    /*
+    ** Did we allocate data inside the callbacks, or did the user
+    ** supply that.
+    */
+    bool is_allocated MEMCACHED_BITFIELD;
+  } sasl;
+
+#endif
   char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
   struct {
-    bool is_allocated:1;
+    bool is_allocated MEMCACHED_BITFIELD;
   } options;
 
 };
@@ -149,17 +162,20 @@ void *memcached_get_user_data(const memcached_st *ptr);
 LIBMEMCACHED_API
 void *memcached_set_user_data(memcached_st *ptr, void *data);
 
+LIBMEMCACHED_API
+memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source);
+
+LIBMEMCACHED_API
+memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key);
+
+LIBMEMCACHED_API
+uint32_t memcached_server_count(const memcached_st *);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif
 
 
-// Local Only Inline
-static inline memcached_server_st *memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key)
-{
-  return &ptr->servers[server_key];
-}
-
 #ifdef __cplusplus
 class Memcached : private memcached_st {
 public:
@@ -180,7 +196,7 @@ public:
   }
 
   Memcached& operator=(const Memcached& source)
-  { 
+  {
     memcached_free(this);
     memcached_clone(this, &source);