--- libmariadb/CMakeLists.txt	Mon Jan 19 23:26:36 1970
+++ libmariadb/CMakeLists.txt	Mon Jan 19 23:26:36 1970
@@ -98,9 +98,12 @@
 client_plugin.c
 my_auth.c
 ma_secure.c
-libmariadb_exports.def
 )
 
+IF(MSVC)
+  SET(LIBMARIADB_SOURCES ${LIBMARIADB_SOURCES} libmariadb_exports.def)
+ENDIF()
+
 IF(WIN32)
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/win-iconv)
   SET(LIBMARIADB_SOURCES ${LIBMARIADB_SOURCES}
@@ -208,9 +211,9 @@
 
 INSTALL(TARGETS
           libmariadb mariadbclient
-          RUNTIME DESTINATION "lib/mariadb"
-          LIBRARY DESTINATION "lib/mariadb"
-          ARCHIVE DESTINATION "lib/mariadb")
+          RUNTIME DESTINATION "lib"
+          LIBRARY DESTINATION "lib"
+          ARCHIVE DESTINATION "lib")
 IF(NOT WIN32 AND WITH_MYSQLCOMPAT)
   INSTALL(FILES "${CMAKE_BINARY_DIR}/libmariadb/libmysql${CMAKE_SHARED_LIBRARY_SUFFIX}"
                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX}"
--- CMakeLists.txt	Mon Jan 19 23:26:36 1970
+++ CMakeLists.txt	Mon Jan 19 23:26:36 1970
@@ -28,7 +28,7 @@
 ###############
 
 
-IF(WIN32)
+IF(MSVC)
   # Speedup system tests
   INCLUDE(${CMAKE_SOURCE_DIR}/cmake/WindowsCache.cmake)
   IF (MSVC)
@@ -127,7 +127,9 @@
   SET(HAVE_THREADS 1)
   ADD_DEFINITIONS(-DHAVE_DLOPEN)
   ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996" )
+  IF(MSVC)
+     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996" )
+  ENDIF()
 ELSEIF()
   SET(HAVE_THREADS ${CMAKE_USE_PTHREADS})
 ENDIF()
@@ -179,7 +181,7 @@
 ENDIF()
 
 
-IF(WIN32)
+IF(MSVC)
  SET(CMAKE_INSTALL_PREFIX "")
 ENDIF()
 
--- include/my_global.h	Mon Jan 19 23:26:36 1970
+++ include/my_global.h	Mon Jan 19 23:26:36 1970
@@ -297,7 +297,9 @@
 
 #if defined(__GNUC__)
 #define function_volatile	volatile
+#ifndef my_reinterpret_cast
 #define my_reinterpret_cast(A) reinterpret_cast<A>
+#endif
 #define my_const_cast(A) const_cast<A>
 #elif !defined(my_reinterpret_cast)
 #define my_reinterpret_cast(A) (A)
@@ -741,7 +743,7 @@
 
 #define NOT_FIXED_DEC 31
 
-#ifdef _WIN32
+#if defined(_WIN32) && defined(_MSVC)
 #define MYSQLND_LLU_SPEC "%I64u"
 #define MYSQLND_LL_SPEC "%I64d"
 #ifndef L64
--- include/my_pthread.h	Mon Jan 19 23:26:36 1970
+++ include/my_pthread.h	Mon Jan 19 23:26:36 1970
@@ -61,10 +61,12 @@
   CRITICAL_SECTION waiters_count_lock;
 } pthread_cond_t;
 
+#ifndef _TIMESPEC_DEFINED
 struct timespec {		/* For pthread_cond_timedwait() */
     time_t tv_sec;
     long tv_nsec;
 };
+#endif
 
 typedef int pthread_mutexattr_t;
 #define pthread_self() GetCurrentThreadId()
--- include/my_sys.h	Mon Jan 19 23:26:36 1970
+++ include/my_sys.h	Mon Jan 19 23:26:36 1970
@@ -136,7 +136,9 @@
 #pragma alloca
 #endif /* _AIX */
 #if defined(__GNUC__) && !defined(HAVE_ALLOCA_H)
+#ifndef alloca
 #define alloca __builtin_alloca
+#endif
 #endif /* GNUC */
 #define my_alloca(SZ) alloca((size_t) (SZ))
 #define my_afree(PTR) {}
--- libmariadb/violite.c	Mon Jan 19 23:26:36 1970
+++ libmariadb/violite.c	Mon Jan 19 23:26:36 1970
@@ -144,7 +144,7 @@
     {
       /* set to blocking mode by default */
       ulong arg=0, r;
-      r = ioctlsocket(vio->sd,FIONBIO,(void*) &arg, sizeof(arg));
+      r = ioctlsocket(vio->sd,FIONBIO,(void*) &arg/*, sizeof(arg)*/);
     }
 #endif
   }
@@ -235,7 +235,7 @@
 my_bool vio_read_peek(Vio *vio, size_t *bytes)
 {
 #ifdef _WIN32
-  if (ioctlsocket(vio->sd, FIONREAD, (unsigned long)bytes))
+  if (ioctlsocket(vio->sd, FIONREAD, (unsigned long*)bytes))
     return TRUE;
 #else
   char buffer[1024];
@@ -329,7 +329,7 @@
       vio->fcntl_mode |= O_NONBLOCK; /* set bit */
     }
     if (old_fcntl != vio->fcntl_mode)
-      r = ioctlsocket(vio->sd,FIONBIO,(void*) &arg, sizeof(arg));
+      r = ioctlsocket(vio->sd,FIONBIO,(void*) &arg/*, sizeof(arg)*/);
   }
 #endif /* !defined(_WIN32) && !defined(__EMX__) */
   DBUG_RETURN(r);