diff options
| author | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-18 01:43:46 +0000 |
|---|---|---|
| committer | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-18 01:43:46 +0000 |
| commit | 1950be354765cfc65032d61a3352d0b8f58929c0 (patch) | |
| tree | 691c2d14c1e168bc371df364c62b049e4f0589f8 /src/mysql | |
| parent | 4ee37b0132cb5da002ec8a071b4269133cb11768 (diff) | |
| download | hercules-1950be354765cfc65032d61a3352d0b8f58929c0.tar.gz hercules-1950be354765cfc65032d61a3352d0b8f58929c0.tar.bz2 hercules-1950be354765cfc65032d61a3352d0b8f58929c0.tar.xz hercules-1950be354765cfc65032d61a3352d0b8f58929c0.zip | |
* Fixed warnings on compilers again.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5654 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/mysql')
| -rw-r--r-- | src/mysql/my_global.h | 13 |
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
|