From 08fe840bfd3f718a4e3e5b956de25967836c5f0e Mon Sep 17 00:00:00 2001
From: Nicholas Hastings <nshastings@gmail.com>
Date: Tue, 20 Mar 2018 17:25:48 -0400
Subject: [PATCH] Probably fix Windows build.

---
 extensions/mysql/AMBuilder        | 4 ++--
 extensions/mysql/mysql/MyDriver.h | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/extensions/mysql/AMBuilder b/extensions/mysql/AMBuilder
index 0054ae50..3ebc98b4 100644
--- a/extensions/mysql/AMBuilder
+++ b/extensions/mysql/AMBuilder
@@ -23,9 +23,9 @@ if SM.mysql_root:
     if builder.target.platform == 'linux':
       binary.compiler.postlink += ['-lrt']
     elif builder.target.platform == 'windows':
+      binary.compiler.defines += ['WIN32_LEAN_AND_MEAN']
       binary.compiler.postlink += [
-        os.path.join(SM.mysql_root[arch], 'lib', 'opt', 'mysqlclient.lib'),
-        os.path.join(SM.mysql_root[arch], 'lib', 'opt', 'zlib.lib'),
+        os.path.join(SM.mysql_root[arch], 'lib', 'mysqlclient.lib'),
         'wsock32.lib'
       ]
 
diff --git a/extensions/mysql/mysql/MyDriver.h b/extensions/mysql/mysql/MyDriver.h
index 3d3114e8..e1660dbe 100644
--- a/extensions/mysql/mysql/MyDriver.h
+++ b/extensions/mysql/mysql/MyDriver.h
@@ -36,14 +36,12 @@
 #include <IDBDriver.h>
 #include <sm_platform.h>
 #if defined PLATFORM_WINDOWS
-#include <winsock.h>
+#include <WinSock2.h>
 #endif
 
 #include <mysql.h>
-#if !defined(PLATFORM_WINDOWS)
-# include <my_global.h>
-# include <my_sys.h>
-#endif
+#include <my_global.h>
+#include <my_sys.h>
 
 #include <sh_string.h>
 #include <sh_list.h>