From a52270d7acdbe6f373f089393a96573b874eb381 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@montyprogram.com>
Date: Tue, 20 Nov 2012 15:24:39 +0100
Subject: [PATCH] MDEV-3868 : windows client compilation issues

Avoid inclusion of Windows headers via client API headers, since it traditionally
lead to different  subtle compilation problems. Instead define my_socket in a way that is compatible with SOCKET (unsigned int in 32 bit , unsigned longlong in 64 bit)
---
 include/mysql.h     | 11 +++++------
 include/mysql_com.h |  3 ---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/include/mysql.h b/include/mysql.h
index 1fc164f62b2..fa62026b44a 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -47,9 +47,6 @@ extern "C" {
 #ifndef MYSQL_ABI_CHECK
 #include <sys/types.h>
 #endif
-#ifdef __LCC__
-#include <winsock2.h>				/* For windows */
-#endif
 typedef char my_bool;
 #if (defined(_WIN32) || defined(_WIN64)) && !defined(__WIN__)
 #define __WIN__
@@ -61,11 +58,13 @@ typedef char my_bool;
 #endif
 
 #ifndef my_socket_defined
-#ifdef __WIN__
-#define my_socket SOCKET
+#if defined (_WIN64)
+#define my_socket unsigned long long
+#elif defined (_WIN32)
+#define my_socket unsigned int
 #else
 typedef int my_socket;
-#endif /* __WIN__ */
+#endif /* _WIN64 */
 #endif /* my_socket_defined */
 #endif /* _global_h */
 
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 0988d20f97f..6e8a2b23de0 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -57,9 +57,6 @@
 #define LOCAL_HOST	"localhost"
 #define LOCAL_HOST_NAMEDPIPE "."
 
-#ifdef _WIN32
-#include <ws2tcpip.h>
-#endif
 
 #if defined(__WIN__) && !defined( _CUSTOMCONFIG_)
 #define MYSQL_NAMEDPIPE "MySQL"