C++: double underscores are reserved

[awesomized/libmemcached] / src / libmemcached / connect.cc

diff --git a/src/libmemcached/connect.cc b/src/libmemcached/connect.cc
index ff7772ca1c39bb97f14d5b6a396160fa59db1a67..84617133741a9e5332e212ac50f29af4f2a8b563 100644 (file)
--- a/src/libmemcached/connect.cc
+++ b/src/libmemcached/connect.cc
@@ -14,32 +14,10 @@
 */
 
 #include "libmemcached/common.h"
+#include "p9y/poll.hpp"
 
 #include <cassert>
 
-#ifndef SOCK_CLOEXEC
-#  define SOCK_CLOEXEC 0
-#endif
-
-#ifndef SOCK_NONBLOCK
-#  define SOCK_NONBLOCK 0
-#endif
-
-#ifndef FD_CLOEXEC
-#  define FD_CLOEXEC 0
-#endif
-
-#ifndef SO_NOSIGPIPE
-#  define SO_NOSIGPIPE 0
-#endif
-
-#ifndef TCP_NODELAY
-#  define TCP_NODELAY 0
-#endif
-
-#ifndef TCP_KEEPIDLE
-#  define TCP_KEEPIDLE 0
-#endif
 
 static memcached_return_t connect_poll(memcached_instance_st *server, const int connection_error) {
   struct pollfd fds[1];
@@ -62,7 +40,7 @@ static memcached_return_t connect_poll(memcached_instance_st *server, const int
     if ((number_of = poll(fds, 1, server->root->connect_timeout)) == SOCKET_ERROR) {
       int local_errno = get_socket_errno(); // We cache in case closesocket() modifies errno
       switch (local_errno) {
-#ifdef __linux__
+#ifdef HAVE_ERESTART
       case ERESTART:
 #endif
       case EINTR: