- Applied the suggested fixes by Joshuaali to fix the compiling of the sql map server on Win32 systems.

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

2 files changed, 5 insertions, 6 deletions

diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h
index ec539a3db..ff9109dd1 100644
--- a/src/common/cbasetypes.h
+++ b/src/common/cbasetypes.h
@@ -65,9 +65,11 @@ typedef unsigned int	uint;	// don't use
 typedef   signed long	slong;	// don't use (only for ie. file-io)

 typedef unsigned long	ulong;	// don't use

 

+#ifndef WIN32

 typedef char*           pchar;

-typedef const char*     cchar;

 typedef unsigned char*	puchar;

+#endif

+typedef const char*     cchar;

 typedef void*			ptr;

 typedef int*			pint;

 

diff --git a/src/mysql/my_global.h b/src/mysql/my_global.h
index 10d667b95..65e251ab3 100644
--- a/src/mysql/my_global.h
+++ b/src/mysql/my_global.h
@@ -497,11 +497,8 @@ typedef char	pbool;		/* Mixed prototypes can take char */
 typedef short	pshort;		/* Mixed prototypes can take short int */

 typedef float	pfloat;		/* Mixed prototypes can take float */

 #else

-//These types already exist in WinNT systems... 

-//...but what do we do about Win9X ones? [Skotlex]

-//typedef int	pchar;		/* Mixed prototypes can't take char */

-//typedef uint	puchar;		/* Mixed prototypes can't take char */

-#include <winnt.h>

+typedef int	pchar;		/* Mixed prototypes can't take char */

+typedef uint	puchar;		/* Mixed prototypes can't take char */

 typedef int	pbool;		/* Mixed prototypes can't take char */

 typedef int	pshort;		/* Mixed prototypes can't take short int */

 typedef double	pfloat;		/* Mixed prototypes can't take float */