From 5dcbf2e84a46ee8e5c520a6bf2b35b643425f172 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Mon, 28 Nov 2011 13:50:36 -0800 Subject: [PATCH] Remove private declaration from public API. --- libmemcached-1.0/server.h | 15 --------------- libmemcached/server.hpp | 26 ++++++++++++++++++-------- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/libmemcached-1.0/server.h b/libmemcached-1.0/server.h index 38ab40a9..40548112 100644 --- a/libmemcached-1.0/server.h +++ b/libmemcached-1.0/server.h @@ -119,10 +119,6 @@ void memcached_server_error_reset(memcached_server_st *ptr); LIBMEMCACHED_API void memcached_server_free(memcached_server_st *ptr); -LIBMEMCACHED_LOCAL -memcached_server_st *memcached_server_clone(memcached_server_st *destination, - memcached_server_st *source); - LIBMEMCACHED_API memcached_server_instance_st memcached_server_get_last_disconnect(const memcached_st *ptr); @@ -138,13 +134,6 @@ LIBMEMCACHED_API memcached_return_t memcached_server_add(memcached_st *ptr, const char *hostname, in_port_t port); -LIBMEMCACHED_LOCAL - memcached_return_t memcached_server_add_parsed(memcached_st *ptr, - const char *hostname, - size_t hostname_length, - in_port_t port, - uint32_t weight); - LIBMEMCACHED_API memcached_return_t memcached_server_add_udp_with_weight(memcached_st *ptr, const char *hostname, @@ -174,10 +163,6 @@ in_port_t memcached_server_port(const memcached_server_instance_st self); LIBMEMCACHED_API const char *memcached_server_type(const memcached_server_instance_st ptr); - -LIBMEMCACHED_LOCAL -void __server_free(memcached_server_st *); - #ifdef __cplusplus } // extern "C" #endif diff --git a/libmemcached/server.hpp b/libmemcached/server.hpp index b5f31f66..5d718949 100644 --- a/libmemcached/server.hpp +++ b/libmemcached/server.hpp @@ -43,6 +43,24 @@ #include +memcached_server_st *__server_create_with(memcached_st *memc, + memcached_server_write_instance_st host, + const memcached_string_t& hostname, + const in_port_t port, + uint32_t weight, + const memcached_connection_t type); + +memcached_server_st *memcached_server_clone(memcached_server_st *destination, + memcached_server_st *source); + +memcached_return_t memcached_server_add_parsed(memcached_st *ptr, + const char *hostname, + size_t hostname_length, + in_port_t port, + uint32_t weight); + +void __server_free(memcached_server_st *); + static inline bool memcached_is_valid_servername(const memcached_string_t& arg) { return arg.size > 0 or arg.size < NI_MAXHOST; @@ -99,11 +117,3 @@ static inline void memcached_mark_server_for_timeout(memcached_server_write_inst set_last_disconnected_host(server); } } - -LIBMEMCACHED_LOCAL - memcached_server_st *__server_create_with(memcached_st *memc, - memcached_server_write_instance_st host, - const memcached_string_t& hostname, - const in_port_t port, - uint32_t weight, - const memcached_connection_t type); -- 2.30.2