diff options
| author | Willem Jan Palenstijn | 2015-09-14 22:46:38 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-09-14 22:46:38 +0200 |
| commit | 97aa214e89b4005a3d08ca5a7246e7bf8597e1c1 (patch) | |
| tree | 2796af711b78b33f1c38bd653bcbe50fc8df73ff /backends/platform/symbian/src/portdefs.h | |
| parent | dab5cd387dd10e7c75987bac97e974216806bba3 (diff) | |
| parent | bf822e7dc03327da937cb37cb4cc9f9e1af3f4b5 (diff) | |
| download | scummvm-rg350-97aa214e89b4005a3d08ca5a7246e7bf8597e1c1.tar.gz scummvm-rg350-97aa214e89b4005a3d08ca5a7246e7bf8597e1c1.tar.bz2 scummvm-rg350-97aa214e89b4005a3d08ca5a7246e7bf8597e1c1.zip | |
Merge branch 'fix_remove_error'
This is a manual merge of pull request #614, with an added commit.
Diffstat (limited to 'backends/platform/symbian/src/portdefs.h')
| -rw-r--r-- | backends/platform/symbian/src/portdefs.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h index 1fb941963b..f9da09d3eb 100644 --- a/backends/platform/symbian/src/portdefs.h +++ b/backends/platform/symbian/src/portdefs.h @@ -58,11 +58,17 @@ typedef signed long int int32; // re-define those data types. #define SCUMMVM_DONT_DEFINE_TYPES +// 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 + #define SMALL_SCREEN_DEVICE #define DISABLE_COMMAND_LINE #define USE_RGB_COLOR -int remove(const char *path); #if defined(USE_TREMOR) && !defined(USE_VORBIS) #define USE_VORBIS // make sure this one is defined together with USE_TREMOR! |