summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-02-17 13:48:04 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-02-17 13:48:04 +0000
commitce90e748fccfaf86c857b94a604044b9dd53b3e7 (patch)
tree2b78f51dffb06a210dd33e70165190e6dcaadff7 /src
parent25fac517af46dd681e1fe9b9d5bd1406ff9d1108 (diff)
downloadhercules-ce90e748fccfaf86c857b94a604044b9dd53b3e7.tar.gz
hercules-ce90e748fccfaf86c857b94a604044b9dd53b3e7.tar.bz2
hercules-ce90e748fccfaf86c857b94a604044b9dd53b3e7.tar.xz
hercules-ce90e748fccfaf86c857b94a604044b9dd53b3e7.zip
- 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
Diffstat (limited to 'src')
-rw-r--r--src/common/cbasetypes.h4
-rw-r--r--src/mysql/my_global.h7
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 */