C++: double underscores are reserved

[awesomized/libmemcached] / src / libmemcached / server.hpp

diff --git a/src/libmemcached/server.hpp b/src/libmemcached/server.hpp
index 017242bd9d8810d869866e88cfa484a08d347d50..d6fdd0da6a5c7e0694246ead1d5cd69780cf40d8 100644 (file)
--- a/src/libmemcached/server.hpp
+++ b/src/libmemcached/server.hpp
@@ -15,13 +15,11 @@
 
 #pragma once
 
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-#endif
+#include "p9y/gettimeofday.hpp"
 
 #include <cassert>
 
-memcached_server_st *__server_create_with(memcached_st *memc, memcached_server_st *self,
+memcached_server_st *server_create_with(memcached_st *memc, memcached_server_st *self,
                                           const memcached_string_t &hostname, const in_port_t port,
                                           uint32_t weight, const memcached_connection_t type);
 
@@ -29,7 +27,7 @@ memcached_return_t memcached_server_add_parsed(memcached_st *ptr, const char *ho
                                                size_t hostname_length, in_port_t port,
                                                uint32_t weight);
 
-void __server_free(memcached_server_st *);
+void server_free(memcached_server_st *);
 
 static inline bool memcached_is_valid_servername(const memcached_string_t &arg) {
   return (arg.c_str != NULL or arg.size == 0) and arg.size < MEMCACHED_NI_MAXHOST;