diff options
| author | Max Horn | 2011-05-31 13:48:03 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-31 13:48:03 +0200 |
| commit | 9c3e2e43bde0c03ec012b83cd501a93a9ec4025e (patch) | |
| tree | b85ae443c4bd0434bc2593422d43aef559ea031e /common | |
| parent | bea6858953dbcde1c6dc88345631f14d9b550ef8 (diff) | |
| download | scummvm-rg350-9c3e2e43bde0c03ec012b83cd501a93a9ec4025e.tar.gz scummvm-rg350-9c3e2e43bde0c03ec012b83cd501a93a9ec4025e.tar.bz2 scummvm-rg350-9c3e2e43bde0c03ec012b83cd501a93a9ec4025e.zip | |
COMMON: Move some code from scummsys.h to relevant portdefs.h files
Diffstat (limited to 'common')
| -rw-r--r-- | common/scummsys.h | 78 |
1 files changed, 12 insertions, 66 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index 5cf3ba4dad..cc8f3b987a 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -320,75 +320,21 @@ // -// Typedef our system types +// Typedef our system types unless they have already been defined by config.h, +// or SCUMMVM_DONT_DEFINE_TYPES is set. // -#if !defined(HAVE_CONFIG_H) - - #if defined(__SYMBIAN32__) - - // Enable Symbians own datatypes - // This is done for two reasons - // a) uint is already defined by Symbians libc component - // b) Symbian is using its "own" datatyping, and the Scummvm port - // should follow this to ensure the best compability possible. - typedef unsigned char byte; - - typedef unsigned char uint8; - typedef signed char int8; - - typedef unsigned short int uint16; - typedef signed short int int16; - - typedef unsigned long int uint32; - typedef signed long int int32; - - #elif defined(__GP32__) - - // Override typenames. uint is already defined by system header files. - typedef unsigned char byte; - - typedef unsigned char uint8; - typedef signed char int8; - - typedef unsigned short int uint16; - typedef signed short int int16; - - typedef unsigned long int uint32; - typedef signed long int int32; - - #elif defined(__N64__) - - typedef unsigned char byte; - - typedef unsigned char uint8; - typedef signed char int8; - - typedef unsigned short int uint16; - typedef signed short int int16; - - typedef unsigned int uint32; - typedef signed int int32; - - #elif defined(__DS__) - - // Do nothing, the SDK defines all types we need in nds/ndstypes.h, - // which we include in our portsdef.h - - #else - - typedef unsigned char byte; - typedef unsigned char uint8; - typedef signed char int8; - typedef unsigned short uint16; - typedef signed short int16; - typedef unsigned int uint32; - typedef signed int int32; - typedef unsigned int uint; - - #endif - +#if !defined(HAVE_CONFIG_H) && !defined(SCUMMVM_DONT_DEFINE_TYPES) + typedef unsigned char byte; + typedef unsigned char uint8; + typedef signed char int8; + typedef unsigned short uint16; + typedef signed short int16; + typedef unsigned int uint32; + typedef signed int int32; + typedef unsigned int uint; #endif + // // Define scumm_stricmp and scumm_strnicmp // |