--- unittest/libmariadb/async.c	Mon Jan 19 23:21:08 1970
+++ unittest/libmariadb/async.c	Mon Jan 19 23:21:08 1970
@@ -21,7 +21,7 @@
 #ifndef _WIN32
 #include <poll.h>
 #else
-#include <WinSock2.h>
+#include <winsock2.h>
 #endif
 
 #include <stdlib.h>
--- cmake/FindIconv.cmake	Mon Jan 19 23:21:08 1970
+++ cmake/FindIconv.cmake	Mon Jan 19 23:21:08 1970
@@ -7,7 +7,7 @@
 
 IF(APPLE)
   find_path(ICONV_INCLUDE_DIR iconv.h PATHS
-            /opt/local/include/
+            /usr/include/
             NO_CMAKE_SYSTEM_PATH)
 ELSE()
   find_path(ICONV_INCLUDE_DIR iconv.h)
@@ -15,7 +15,7 @@
 
 IF(APPLE)
   find_library(ICONV_LIBRARIES NAMES iconv libiconv c PATHS
-               /opt/local/lib/
+               /usr/lib/
                NO_CMAKE_SYSTEM_PATH)
 ELSE()
   find_library(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
--- include/my_global.h	Mon Jan 19 23:21:08 1970
+++ include/my_global.h	Mon Jan 19 23:21:08 1970
@@ -454,7 +454,9 @@
 #ifdef _WIN32
 #define NO_DIR_LIBRARY		/* Not standar dir-library */
 #define USE_MY_STAT_STRUCT	/* For my_lib */
+#ifndef _SIZE_T_DEFINED
 typedef SSIZE_T ssize_t;
+#endif
 #endif
 
 /* Some things that this system does have */