X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Fmemcached.h;h=db164649922258dddd7832169e14d4ab8e1e33b2;hb=226c5487c7e101b7b3606074b3b795eb547ebaa2;hp=9415f4321eb84d946cc27bc108a2122fde93e56e;hpb=56bb95c23210147d45b792e4e494e995d9de76dc;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 9415f432..db164649 100644
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -48,6 +48,7 @@
 #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>
@@ -79,6 +80,7 @@ struct memcached_st {
     bool use_sort_hosts MEMCACHED_BITFIELD;
     bool use_udp MEMCACHED_BITFIELD;
     bool verify_key MEMCACHED_BITFIELD;
+    bool tcp_keepalive MEMCACHED_BITFIELD;
   } flags;
   memcached_server_distribution_t distribution;
   hashkit_st hashkit;
@@ -149,17 +151,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: