diff options
| author | Kostas Nakos | 2006-10-08 18:15:18 +0000 |
|---|---|---|
| committer | Kostas Nakos | 2006-10-08 18:15:18 +0000 |
| commit | 4524b49872b238db92922dbe961a8f1aa8430178 (patch) | |
| tree | a4de68a8132e22377687a6b005446d757cbe14ab /common | |
| parent | 1307f597a69ac913b6045a9dfa8e07221e021cde (diff) | |
| download | scummvm-rg350-4524b49872b238db92922dbe961a8f1aa8430178.tar.gz scummvm-rg350-4524b49872b238db92922dbe961a8f1aa8430178.tar.bz2 scummvm-rg350-4524b49872b238db92922dbe961a8f1aa8430178.zip | |
Initial commit of the wince-gcc re-port
svn-id: r24212
Diffstat (limited to 'common')
| -rw-r--r-- | common/scummsys.h | 11 | ||||
| -rw-r--r-- | common/util.cpp | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index 0fdecf791a..d586e9795a 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -119,8 +119,10 @@ #define SCUMM_LITTLE_ENDIAN - #define FORCEINLINE __forceinline - #define NORETURN _declspec(noreturn) + #ifndef __GNUC__ + #define FORCEINLINE __forceinline + #define NORETURN _declspec(noreturn) + #endif #define PLUGIN_EXPORT __declspec(dllexport) #if _WIN32_WCE < 300 @@ -133,11 +135,6 @@ 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 diff --git a/common/util.cpp b/common/util.cpp index e3bc306c30..aee003363b 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -25,6 +25,11 @@ #include "common/system.h" #include "gui/debugger.h" +#ifdef _WIN32_WCE +// This is required for the debugger attachment +extern bool isSmartphone(void); +#endif + namespace Common { // |