X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Fio.cc;h=019eafb6e5c9104771f95885d89786d65fda1e2c;hb=8e04e2a97ba16fce9ebf7d47a944de2dc40ba453;hp=866830aa5528d016004e4539a0b010b8f0c5a279;hpb=9e4ae978d7d40c4f1c7d221c61a07a31a5e270d5;p=m6w6%2Flibmemcached

diff --git a/libmemcached/io.cc b/libmemcached/io.cc
index 866830aa..019eafb6 100644
--- a/libmemcached/io.cc
+++ b/libmemcached/io.cc
@@ -39,6 +39,10 @@
 
 #include <libmemcached/common.h>
 
+#ifdef HAVE_SYS_SOCKET_H
+#  include <sys/socket.h>
+#endif
+
 void initialize_binary_request(org::libmemcached::Instance* server, protocol_binary_request_header& header)
 {
   server->request_id++;
@@ -708,7 +712,7 @@ void memcached_io_close(org::libmemcached::Instance* ptr)
   }
 
   /* in case of death shutdown to avoid blocking at close() */
-  if (shutdown(ptr->fd, SHUT_RDWR) == SOCKET_ERROR && get_socket_errno() != ENOTCONN)
+  if (shutdown(ptr->fd, SHUT_RDWR) == SOCKET_ERROR and get_socket_errno() != ENOTCONN)
   {
     WATCHPOINT_NUMBER(ptr->fd);
     WATCHPOINT_ERRNO(get_socket_errno());