X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fserver.hpp;h=98ec66d940ea5440766f074abe31ea3dcbc29cd6;hb=3301b2f6fc5a53b428d29b788ba85fe4dae7b12d;hp=017242bd9d8810d869866e88cfa484a08d347d50;hpb=c8a5aecba8e189092266f304ca81ab42625edf60;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/server.hpp b/src/libmemcached/server.hpp
index 017242bd..98ec66d9 100644
--- a/src/libmemcached/server.hpp
+++ b/src/libmemcached/server.hpp
@@ -1,6 +1,6 @@
 /*
     +--------------------------------------------------------------------+
-    | libmemcached - C/C++ Client Library for memcached                  |
+    | libmemcached-awesome - C/C++ Client Library for memcached          |
     +--------------------------------------------------------------------+
     | Redistribution and use in source and binary forms, with or without |
     | modification, are permitted under the terms of the BSD license.    |
@@ -9,19 +9,17 @@
     | the terms online at: https://opensource.org/licenses/BSD-3-Clause  |
     +--------------------------------------------------------------------+
     | Copyright (c) 2006-2014 Brian Aker   https://datadifferential.com/ |
-    | Copyright (c) 2020 Michael Wallner   <mike@php.net>                |
+    | Copyright (c) 2020-2021 Michael Wallner        https://awesome.co/ |
     +--------------------------------------------------------------------+
 */
 
 #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;