Merge in all of build.

[m6w6/libmemcached] / libmemcached / platform.h

diff --git a/libmemcached/platform.h b/libmemcached/platform.h
index 8b30f7732a99b4783e781d28dab4f3409a5b4ac2..e7511cad0d67c6f8fa73d9b8843450bb67ea606c 100644 (file)
--- a/libmemcached/platform.h
+++ b/libmemcached/platform.h
@@ -16,14 +16,15 @@
 #include <winsock2.h>
 #include <ws2tcpip.h>
 typedef short in_port_t;
+typedef SOCKET memcached_socket_t;
 #else
-typedef int SOCKET;
+typedef int memcached_socket_t;
 #include <sys/socket.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/un.h>
 #include <netinet/tcp.h>
-#include <netinet/in.h>
 
 #endif /* WIN32 */