3 files changed, 15 insertions, 2 deletions
diff --git a/src/common/utils.c b/src/common/utils.c
index 57dc1f480..bbf9f8398 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -101,7 +101,7 @@ int strcasecmp(const char *arg1, const char *arg2)
   return (0);
 }
 
-int strncasecmp(const char *arg1, const char *arg2, int n)
+int strncasecmp(const char *arg1, const char *arg2, size_t n)
 {
   int chk, i;
 
diff --git a/src/common/utils.h b/src/common/utils.h
index 9d2febe1b..7c3c1f40c 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -15,7 +15,7 @@
 /* strcasecmp -> stricmp -> str_cmp */
 #if defined(_WIN32) && !defined(MINGW)
 	int	strcasecmp(const char *arg1, const char *arg2);
-	int	strncasecmp(const char *arg1, const char *arg2, int n);
+	int	strncasecmp(const char *arg1, const char *arg2, size_t n);
 	void str_upper(char *name);
 	void str_lower(char *name);
     char *rindex(char *str, char c);
diff --git a/src/mysql/my_global.h b/src/mysql/my_global.h
index 65e251ab3..af723424d 100644
--- a/src/mysql/my_global.h
+++ b/src/mysql/my_global.h
@@ -779,8 +779,13 @@ typedef void	*gptr;		/* Generic pointer */
 typedef char	*gptr;		/* Generic pointer */
 #endif
 #ifndef HAVE_INT_8_16_32
+#ifndef WIN32
 typedef signed char int8;       /* Signed integer >= 8  bits */
 typedef short	int16;		/* Signed integer >= 16 bits */
+#else
+typedef          __int8		int8;
+typedef          __int16	int16;
+#endif
 #endif
 #ifndef HAVE_UCHAR
 typedef unsigned char	uchar;	/* Short for unsigned char */
@@ -795,10 +800,18 @@ typedef int		int32;
 typedef unsigned int	uint32; /* Short for unsigned integer >= 32 bits */
 #elif SIZEOF_LONG == 4
 #ifndef HAVE_INT_8_16_32
+#ifndef WIN32
 typedef long		int32;
+#else
+typedef          __int32	int32;
 #endif
+#endif
+#ifndef WIN32
 typedef unsigned long	uint32; /* Short for unsigned integer >= 32 bits */
 #else
+typedef unsigned __int32	uint32;
+#endif
+#else
 #error "Neither int or long is of 4 bytes width"
 #endif