diff options
| -rw-r--r-- | backends/platform/symbian/src/portdefs.h | 7 | ||||
| -rw-r--r-- | backends/saves/default/default-saves.cpp | 9 |
2 files changed, 8 insertions, 8 deletions
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h index d0769136b2..f9da09d3eb 100644 --- a/backends/platform/symbian/src/portdefs.h +++ b/backends/platform/symbian/src/portdefs.h @@ -58,9 +58,10 @@ 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 +// Hide the macro "remove" defined in unistd.h from anywere except where +// we explicitly require it. This lets us use the name "remove" in engines. +// Must be after including unistd.h . +#ifndef SYMBIAN_USE_SYSTEM_REMOVE #undef remove #endif diff --git a/backends/saves/default/default-saves.cpp b/backends/saves/default/default-saves.cpp index cca7535d27..4f7013724a 100644 --- a/backends/saves/default/default-saves.cpp +++ b/backends/saves/default/default-saves.cpp @@ -20,11 +20,10 @@ * */ -/* 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 +// This define lets us use the system function remove() on Symbian, which +// is disabled by default due to a macro conflict. +// See backends/platform/symbian/src/portdefs.h . +#define SYMBIAN_USE_SYSTEM_REMOVE #include "common/scummsys.h" |