* Fixed warnings on compilers again.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5654 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 13 insertions, 0 deletions

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