diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-16 20:44:44 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-04-16 20:44:44 +0000 |
| commit | 9f47d257ba5bb985bc6753b0f20b90da18664cd1 (patch) | |
| tree | 6c3c5c0157298810886561bcadca78bbe86193db /src/common/cbasetypes.h | |
| parent | cf0a0b7d27a81f572c96e4a79c7ea0c407fe9626 (diff) | |
| download | hercules-9f47d257ba5bb985bc6753b0f20b90da18664cd1.tar.gz hercules-9f47d257ba5bb985bc6753b0f20b90da18664cd1.tar.bz2 hercules-9f47d257ba5bb985bc6753b0f20b90da18664cd1.tar.xz hercules-9f47d257ba5bb985bc6753b0f20b90da18664cd1.zip | |
* Finally fixed mingw problems, managed to build both TXT and SQL
* Fixed the uint32 platform problem (Microsoft failed so I removed it :)
* Removed the cbasetypes.h dependency from the mapcache generator
* Removed some random compilation warnings
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10270 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/cbasetypes.h')
| -rw-r--r-- | src/common/cbasetypes.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/common/cbasetypes.h b/src/common/cbasetypes.h index 67c5a45db..c066c1ebd 100644 --- a/src/common/cbasetypes.h +++ b/src/common/cbasetypes.h @@ -53,7 +53,7 @@ #endif // disable attributed stuff on non-GNU -#ifndef __GNUC__ +#if !defined(__GNUC__) && !defined(MINGW) # define __attribute__(x) #endif @@ -74,26 +74,10 @@ // Integers with guaranteed _exact_ size. ////////////////////////////////////////////////////////////////////////// -////////////////////////////// -#ifdef WIN32 -////////////////////////////// #define SIZEOF_LONG 4 #define SIZEOF_INT 4 #define HAVE_INT_8_16_32 -typedef __int8 int8; -typedef __int16 int16; -typedef __int32 int32; -typedef signed __int8 sint8; -typedef signed __int16 sint16; -typedef signed __int32 sint32; - -typedef unsigned __int8 uint8; -typedef unsigned __int16 uint16; -typedef unsigned __int32 uint32; -////////////////////////////// -#else // GNU -////////////////////////////// typedef char int8; typedef short int16; typedef int int32; @@ -105,9 +89,6 @@ typedef signed int sint32; typedef unsigned char uint8; typedef unsigned short uint16; typedef unsigned int uint32; -////////////////////////////// -#endif -////////////////////////////// #undef UINT8_MIN #undef UINT16_MIN |