diff options
| -rw-r--r-- | base/engine.cpp | 2 | ||||
| -rw-r--r-- | base/gameDetector.cpp | 4 | ||||
| -rw-r--r-- | base/main.cpp | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/base/engine.cpp b/base/engine.cpp index a2c722ae6f..b6aa9cc957 100644 --- a/base/engine.cpp +++ b/base/engine.cpp @@ -177,7 +177,7 @@ void NORETURN CDECL error(const char *s, ...) { drawError(buf_output); #endif -#ifdef __PALM_OS__ +#ifdef PALMOS_MODE PalmFatalError(buf_output); #endif diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp index 57e99bad80..53ef204282 100644 --- a/base/gameDetector.cpp +++ b/base/gameDetector.cpp @@ -48,7 +48,7 @@ #endif // DONT FIXME: DO NOT ORDER ALPHABETICALLY, THIS IS ORDERED BY IMPORTANCE/CATEGORY! :) -#if defined(__PALM_OS__) || defined(__SYMBIAN32__) +#if defined(PALMOS_MODE) || defined(__SYMBIAN32__) static const char USAGE_STRING[] = "NoUsageString"; // save more data segment space #else static const char USAGE_STRING[] = @@ -340,7 +340,7 @@ void GameDetector::parseCommandLine(int argc, char **argv) { // environment variable. This is weaker than a --savepath on the // command line, but overrides the default savepath, hence it is // handled here, just before the command line gets parsed. -#if !defined(MACOS_CARBON) && !defined(_WIN32_WCE) && !defined(__PALM_OS__) +#if !defined(MACOS_CARBON) && !defined(_WIN32_WCE) && !defined(PALMOS_MODE) const char *dir = getenv("SCUMMVM_SAVEPATH"); if (dir && *dir) { // TODO: Verify whether the path is valid diff --git a/base/main.cpp b/base/main.cpp index f3d04a325c..562bd3e229 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -50,7 +50,7 @@ #include "backends/dc/DCLauncherDialog.h" #endif -#ifdef __PALM_OS__ +#ifdef PALMOS_68K #include "args.h" #endif @@ -372,7 +372,6 @@ extern "C" int main(int argc, char *argv[]) { #endif // (defined(WIN32) && defined(NO_CONSOLE)) || defined(__SYMBIAN32__) - // Quick preparse of command-line, looking for alt configfile path for (int i = argc - 1; i >= 1; i--) { s = argv[i]; @@ -421,7 +420,7 @@ extern "C" int main(int argc, char *argv[]) { detector.parseCommandLine(argc, argv); -#ifdef __PALM_OS__ +#ifdef PALMOS_68K ArgsFree(argv); #endif |