diff options
| author | Chris Apers | 2007-05-01 09:37:40 +0000 |
|---|---|---|
| committer | Chris Apers | 2007-05-01 09:37:40 +0000 |
| commit | e0a77867ccba4b426fb885fd006c17a241a6f980 (patch) | |
| tree | 7a897e6e03e32f0a8d403c1851e77c5ae46178ec | |
| parent | eac31d6f5627867753198a3ee3cfee421dd2ce94 (diff) | |
| download | scummvm-rg350-e0a77867ccba4b426fb885fd006c17a241a6f980.tar.gz scummvm-rg350-e0a77867ccba4b426fb885fd006c17a241a6f980.tar.bz2 scummvm-rg350-e0a77867ccba4b426fb885fd006c17a241a6f980.zip | |
Cleanup, remove PalmOS dependencies from the ScummVM core
svn-id: r26690
| -rw-r--r-- | common/scummsys.h | 28 | ||||
| -rw-r--r-- | common/util.cpp | 1 |
2 files changed, 17 insertions, 12 deletions
diff --git a/common/scummsys.h b/common/scummsys.h index 94593bf03b..0ba3f67bd8 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -203,27 +203,31 @@ #elif defined(__PALMOS_TRAPS__) || defined (__PALMOS_ARMLET__) - #define scumm_stricmp stricmp - #define scumm_strnicmp strnicmp - #ifdef PALMOS_68K - #define SCUMM_BIG_ENDIAN + # include "globals.h" + # define SCUMM_BIG_ENDIAN + + # define scumm_stricmp StrCaselessCompare + # define scumm_strnicmp StrNCaselessCompare + #else - #define SCUMM_LITTLE_ENDIAN + + # include <extras_string.h> + # define SCUMM_LITTLE_ENDIAN + + # define scumm_stricmp stricmp + # define scumm_strnicmp strnicmp #endif #define SCUMM_NEED_ALIGNMENT - - #include "palmversion.h" - #include "globals.h" - #include "extend.h" - #define STRINGBUFLEN 256 + + extern const char *SCUMMVM_SAVEPATH; #if !defined(COMPILE_ZODIAC) && !defined(COMPILE_OS5) - #define NEWGUI_256 + # define NEWGUI_256 #else - #undef UNUSED + # undef UNUSED #endif #elif defined(__MORPHOS__) diff --git a/common/util.cpp b/common/util.cpp index b8ccde9917..d9da753ac4 100644 --- a/common/util.cpp +++ b/common/util.cpp @@ -551,6 +551,7 @@ void NORETURN CDECL error(const char *s, ...) { #endif #ifdef PALMOS_MODE + extern void PalmFatalError(const char *err); PalmFatalError(buf_output); #endif |