X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcommon.h;h=6de9bbd1e24298026597a8de9d31353b1c8d82e8;hb=1170b1b371ce7bdb50e8e7ae887687f5a45f81b9;hp=469ef3e21a005cfd73922a95cdb37205262b3898;hpb=7b7b8c93445a962375b17f1b22d1fb1b1f693484;p=awesomized%2Flibmemcached

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 469ef3e2..6de9bbd1 100644
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -63,6 +63,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
+
 #include <libmemcached/memcached.h>
 #include <libmemcached/watchpoint.h>
 #include <libmemcached/is.h>
@@ -70,6 +74,13 @@
 
 #include <libmemcached/server_instance.h>
 
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#else
+#include "poll/poll.h"
+#endif
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -109,6 +120,7 @@ memcached_return_t memcached_server_execute(memcached_st *ptr,
 #ifdef __cplusplus
 #include <libmemcached/backtrace.hpp>
 #include <libmemcached/assert.hpp>
+#include <libmemcached/server.hpp>
 #endif
 
 #include <libmemcached/continuum.hpp>
@@ -143,9 +155,6 @@ memcached_return_t run_distribution(memcached_st *ptr);
 #define memcached_server_response_decrement(A) (A)->cursor_active--
 #define memcached_server_response_reset(A) (A)->cursor_active=0
 
-LIBMEMCACHED_LOCAL
-void set_last_disconnected_host(memcached_server_write_instance_st ptr);
-
 #ifdef __cplusplus
 LIBMEMCACHED_LOCAL
 memcached_return_t memcached_key_test(const memcached_st& memc,
@@ -157,14 +166,6 @@ memcached_return_t memcached_key_test(const memcached_st& memc,
 LIBMEMCACHED_LOCAL
 memcached_return_t memcached_purge(memcached_server_write_instance_st ptr);
 
-LIBMEMCACHED_LOCAL
-  memcached_server_st *__server_create_with(const memcached_st *memc,
-                                            memcached_server_write_instance_st host,
-                                            const char *hostname,
-                                            in_port_t port,
-                                            uint32_t weight,
-                                            memcached_connection_t type);
-
 
 static inline memcached_return_t memcached_validate_key_length(size_t key_length, bool binary)
 {