From ce90e748fccfaf86c857b94a604044b9dd53b3e7 Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 17 Feb 2006 13:48:04 +0000 Subject: - 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 --- Changelog-Trunk.txt | 3 +++ src/common/cbasetypes.h | 4 +++- src/mysql/my_global.h | 7 ++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 08774b908..8245ef236 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,9 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS 2006/02/17 + * Applied the suggested fixes by Joshuaali to fix the compiling of the sql + map server on Win32 systems. [Skotlex] + - note that irc.c is still uncompilable, but the rest "should be fine" now. * Fixed the memory leak on opt_2str as pointed out by End of Exam [Skotlex] * Fixed a few char SQL memory leaks as pointed out by End of Exam [Skotlex] 2006/02/16 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 +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 */ -- cgit v1.2.3-60-g2f50