Merge trond from lp:~trond-norbye/libmemcached/bug_396882

[awesomized/libmemcached] / libmemcached / memcached_server.h

diff --git a/libmemcached/memcached_server.h b/libmemcached/memcached_server.h
index 1d68f24e614fb3b0b0393471bf7a2a2ca0147731..fa79df8f65ca4df2e90d013e85b78a1339ddb0b5 100644 (file)
--- a/libmemcached/memcached_server.h
+++ b/libmemcached/memcached_server.h
@@ -47,26 +47,37 @@ struct memcached_server_st {
 #define memcached_server_list(A) (A)->hosts
 #define memcached_server_response_count(A) (A)->cursor_active
 
+LIBMEMCACHED_API
 memcached_return memcached_server_cursor(memcached_st *ptr, 
                                          memcached_server_function *callback,
                                          void *context,
                                          unsigned int number_of_callbacks);
 
+LIBMEMCACHED_API
 memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key, 
                                              size_t key_length, memcached_return *error);
 
 /* These should not currently be used by end users */
+/* TODO: Is the above comment valid? If so, how can we unit test these if they
+ * aren't exported. If not, we should remove the comment */
+LIBMEMCACHED_API
 memcached_server_st *memcached_server_create(memcached_st *memc, memcached_server_st *ptr);
 
+LIBMEMCACHED_API
 memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_server_st *host, 
                                                   const char *hostname, unsigned int port, 
                                                   uint32_t weight, memcached_connection type);
 
+LIBMEMCACHED_API
 void memcached_server_free(memcached_server_st *ptr);
+LIBMEMCACHED_API
 memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr);
+LIBMEMCACHED_API
 memcached_analysis_st *memcached_analyze(memcached_st *memc, memcached_stat_st *stat,
                                          memcached_return *error);
 
+LIBMEMCACHED_API
+memcached_return memcached_server_remove(memcached_server_st *st_ptr);
 
 #ifdef __cplusplus
 }