X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fsocket.hpp;h=a2ee941feed5f722bd97ff3c7868d2f31c2d44a1;hb=68f3c1df6d39eb2e507e32e18632f545dc2e923f;hp=0d18857a296f6db5099da79385d5fc63876c26af;hpb=2ec5c18ff3cf16293ba0f53f91ad0f3a9d800b91;p=m6w6%2Flibmemcached

diff --git a/libmemcached/socket.hpp b/libmemcached/socket.hpp
index 0d18857a..a2ee941f 100644
--- a/libmemcached/socket.hpp
+++ b/libmemcached/socket.hpp
@@ -46,18 +46,19 @@
  * a lot easier to map back to the unix way with macros than going the other
  * way without side effect ;-)
  */
-#ifdef WIN32
-#include "win32/wrappers.h"
-#define get_socket_errno() WSAGetLastError()
+#if defined(WIN32) || defined(__MINGW32__)
+# include "win32/wrappers.h"
+# define get_socket_errno() WSAGetLastError()
 #else
-#define INVALID_SOCKET -1
-#define SOCKET_ERROR -1
-#define closesocket(a) close(a)
-#define get_socket_errno() errno
+# include <unistd.h>
+# define INVALID_SOCKET -1
+# define SOCKET_ERROR -1
+# define closesocket(a) close(a)
+# define get_socket_errno() errno
 #endif
 
 #ifdef __cplusplus
-static inline void memcached_close_socket(int& socket_fd)
+static inline void memcached_close_socket(memcached_socket_t& socket_fd)
 {
   closesocket(socket_fd);
   socket_fd= INVALID_SOCKET;
@@ -65,15 +66,15 @@ static inline void memcached_close_socket(int& socket_fd)
 #endif
 
 #ifndef HAVE_MSG_NOSIGNAL
-#define MSG_NOSIGNAL 0
+# define MSG_NOSIGNAL 0
 #endif
 
 #ifndef HAVE_MSG_DONTWAIT
-#define MSG_DONTWAIT 0
+# define MSG_DONTWAIT 0
 #endif
 
 #ifndef HAVE_MSG_MORE
-#define MSG_MORE 0
+# define MSG_MORE 0
 #endif