diff options
| author | Travis Howell | 2006-09-23 11:44:05 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-09-23 11:44:05 +0000 |
| commit | a0e6154340e3b4b2e0be7ce5b45ae65592798e21 (patch) | |
| tree | 7f80d659477e44ec5ab1a84b6727dcf77bfe6956 | |
| parent | be4628ffca34a8232d44f5c8bb05ecea0e0c56fb (diff) | |
| download | scummvm-rg350-a0e6154340e3b4b2e0be7ce5b45ae65592798e21.tar.gz scummvm-rg350-a0e6154340e3b4b2e0be7ce5b45ae65592798e21.tar.bz2 scummvm-rg350-a0e6154340e3b4b2e0be7ce5b45ae65592798e21.zip | |
Re-order platform order, to avoid exclusions
svn-id: r23981
| -rw-r--r-- | common/scummsys.h | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index 1bc41906e0..0fdecf791a 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -84,7 +84,61 @@ #define SCUMMVM_USE_PRAGMA_PACK -#if defined(_MSC_VER) && !defined(__SYMBIAN32__) && !defined(_WIN32_WCE) +#if defined(__SYMBIAN32__) + + #define scumm_stricmp strcasecmp + #define scumm_strnicmp strncasecmp + + #define SCUMM_LITTLE_ENDIAN + #define SCUMM_NEED_ALIGNMENT + + #define SMALL_SCREEN_DEVICE + + // 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. + #define SCUMMVM_DONT_DEFINE_TYPES + 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(_WIN32_WCE) + + #define scumm_stricmp stricmp + #define scumm_strnicmp _strnicmp + #define snprintf _snprintf + + #define SCUMM_LITTLE_ENDIAN + + #define FORCEINLINE __forceinline + #define NORETURN _declspec(noreturn) + #define PLUGIN_EXPORT __declspec(dllexport) + + #if _WIN32_WCE < 300 + #define CDECL __cdecl + #define SMALL_SCREEN_DEVICE + #endif + + typedef signed char int8_t; + typedef signed short int16_t; + typedef unsigned char uint8_t; + typedef unsigned short uint16_t; + + #if !defined(SDL_COMPILEDVERSION) || (SDL_COMPILEDVERSION < 1210) + typedef signed long int32_t; + typedef unsigned long uint32_t; + #endif + +#elif defined(_MSC_VER) #define scumm_stricmp stricmp #define scumm_strnicmp _strnicmp @@ -259,33 +313,6 @@ #define SCUMM_BIG_ENDIAN #define SCUMM_NEED_ALIGNMENT -#elif defined(__SYMBIAN32__) - - #define scumm_stricmp strcasecmp - #define scumm_strnicmp strncasecmp - - #define SCUMM_LITTLE_ENDIAN - #define SCUMM_NEED_ALIGNMENT - - #define SMALL_SCREEN_DEVICE - - // 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. - #define SCUMMVM_DONT_DEFINE_TYPES - 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 (__DS__) //NeilM #define scumm_stricmp stricmp @@ -303,33 +330,6 @@ #define STRINGBUFLEN 256 -#elif defined(_WIN32_WCE) - - #define scumm_stricmp stricmp - #define scumm_strnicmp _strnicmp - #define snprintf _snprintf - - #define SCUMM_LITTLE_ENDIAN - - #define FORCEINLINE __forceinline - #define NORETURN _declspec(noreturn) - #define PLUGIN_EXPORT __declspec(dllexport) - - #if _WIN32_WCE < 300 - #define CDECL __cdecl - #define SMALL_SCREEN_DEVICE - #endif - - typedef signed char int8_t; - typedef signed short int16_t; - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; - - #if !defined(SDL_COMPILEDVERSION) || (SDL_COMPILEDVERSION < 1210) - typedef signed long int32_t; - typedef unsigned long uint32_t; - #endif - #else #error No system type defined |