X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fio.cc;h=1cc62e47d942d077f329d400761d5938f37db5c6;hb=5070db19f82c59353c86b3d43d81f309cdaab250;hp=27b5ecbd0f244064a743150e71bf4b925223cd72;hpb=cb40bfe8923a2b06160a965d95b45ca0ea3421ab;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/io.cc b/src/libmemcached/io.cc
index 27b5ecbd..1cc62e47 100644
--- a/src/libmemcached/io.cc
+++ b/src/libmemcached/io.cc
@@ -14,10 +14,7 @@
 */
 
 #include "libmemcached/common.h"
-
-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
+#include "p9y/poll.hpp"
 
 void initialize_binary_request(memcached_instance_st *server,
                                protocol_binary_request_header &header) {
@@ -63,7 +60,7 @@ static bool repack_input_buffer(memcached_instance_st *instance) {
           case EWOULDBLOCK:
 #endif
           case EAGAIN:
-#ifdef __linux
+#ifdef HAVE_ERESTART
           case ERESTART:
 #endif
             break; // No IO is fine, we can just move on
@@ -212,7 +209,7 @@ static memcached_return_t io_wait(memcached_instance_st *instance, const short e
     int local_errno = get_socket_errno(); // We cache in case memcached_quit_server() modifies errno
     assert_msg(active_fd == -1, "poll() returned an unexpected value");
     switch (local_errno) {
-#ifdef __linux
+#ifdef ERESTART
     case ERESTART:
 #endif
     case EINTR:
@@ -370,7 +367,7 @@ static memcached_return_t _io_fill(memcached_instance_st *instance) {
       case EWOULDBLOCK:
 #endif
       case EAGAIN:
-#ifdef __linux
+#ifdef HAVE_ERESTART
       case ERESTART:
 #endif
       {
@@ -499,7 +496,7 @@ memcached_return_t memcached_io_slurp(memcached_instance_st *instance) {
       case EWOULDBLOCK:
 #endif
       case EAGAIN:
-#ifdef __linux
+#ifdef ERESTART
       case ERESTART:
 #endif
         if (memcached_success(io_wait(instance, POLLIN))) {