diff options
| author | Fedor Strizhnev | 2015-09-14 22:17:11 +0300 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-09-14 22:43:09 +0200 |
| commit | 99d6dec0597b190c76fc49169a4e5c2e93f7d366 (patch) | |
| tree | 7cfdf42a9aac46187bc135b68fe1ecb92a3c5eb8 | |
| parent | a563077edb1246efe82c75c57250f03b64b5dd9a (diff) | |
| download | scummvm-rg350-99d6dec0597b190c76fc49169a4e5c2e93f7d366.tar.gz scummvm-rg350-99d6dec0597b190c76fc49169a4e5c2e93f7d366.tar.bz2 scummvm-rg350-99d6dec0597b190c76fc49169a4e5c2e93f7d366.zip | |
SYMBIAN: Fix compilation error caused by remove macro
| -rw-r--r-- | backends/platform/symbian/src/portdefs.h | 6 | ||||
| -rw-r--r-- | backends/saves/default/default-saves.cpp | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h index 1fb941963b..f2faa7c878 100644 --- a/backends/platform/symbian/src/portdefs.h +++ b/backends/platform/symbian/src/portdefs.h @@ -58,6 +58,12 @@ typedef signed long int int32; // re-define those data types. #define SCUMMVM_DONT_DEFINE_TYPES +// Hiding macro "remove" defined in unistd.h from anywere except default-saves.cpp. +// Should be after including unistd.h +#ifndef USE_SYSTEM_REMOVE +#undef remove +#endif + #define SMALL_SCREEN_DEVICE #define DISABLE_COMMAND_LINE diff --git a/backends/saves/default/default-saves.cpp b/backends/saves/default/default-saves.cpp index 1b955a5021..cca7535d27 100644 --- a/backends/saves/default/default-saves.cpp +++ b/backends/saves/default/default-saves.cpp @@ -20,6 +20,12 @@ * */ +/* This definition fixes compilation error for Symbian due conflict between + * builting macro "remove" and various functions named "remove" in engines. + * Should be before including scummsys.h + */ +#define USE_SYSTEM_REMOVE + #include "common/scummsys.h" #if !defined(DISABLE_DEFAULT_SAVEFILEMANAGER) |