merge

diff --git a/include/memcached.h b/include/memcached.h
index 1c80878dec9b2e2fdfe2f6e75c6067870af92d70..4b07206238d6b86f916add0ddf87aeca9d4db834 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -261,6 +261,7 @@ memcached_return memcached_stat_servername(memcached_stat_st *stat, char *args,
                                            char *hostname, unsigned int port);
 memcached_return memcached_flush(memcached_st *ptr, time_t expiration);
 memcached_return memcached_verbosity(memcached_st *ptr, unsigned int verbosity);
+memcached_return memcached_version(memcached_st *ptr);
 void memcached_quit(memcached_st *ptr);
 char *memcached_strerror(memcached_st *ptr, memcached_return rc);
 memcached_return memcached_behavior_set(memcached_st *ptr, memcached_behavior flag, uint64_t data);

diff --git a/lib/common.h b/lib/common.h
index 095b7f5e27e52172b309bb607f97069067d5c402..f436cc025d0af6fbd52ce2a97c6df7f15a9c2ec5 100644 (file)
--- a/lib/common.h
+++ b/lib/common.h
@@ -118,7 +118,6 @@ memcached_return memcached_string_reset(memcached_string_st *string);
 void memcached_string_free(memcached_string_st *string);
 memcached_return memcached_do(memcached_server_st *ptr, char *commmand, 
                               size_t command_length, uint8_t with_flush);
-memcached_return memcached_version(memcached_st *ptr);
 memcached_return value_fetch(memcached_server_st *ptr,
                              char *buffer,
                              memcached_result_st *result);