diff options
| author | Fedor Strizhnev | 2015-09-14 22:46:50 +0300 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-09-14 22:43:35 +0200 |
| commit | c7aa5cb995a41f9e4c72b37533277c1b4c9476fc (patch) | |
| tree | 621e8c5fb605b999e8e59f7efba8a58aa609481a | |
| parent | 99d6dec0597b190c76fc49169a4e5c2e93f7d366 (diff) | |
| download | scummvm-rg350-c7aa5cb995a41f9e4c72b37533277c1b4c9476fc.tar.gz scummvm-rg350-c7aa5cb995a41f9e4c72b37533277c1b4c9476fc.tar.bz2 scummvm-rg350-c7aa5cb995a41f9e4c72b37533277c1b4c9476fc.zip | |
SYMBIAN: Delete obsolete fixes for 'remove'
| -rw-r--r-- | backends/platform/symbian/mmp/config.mmh | 13 | ||||
| -rw-r--r-- | backends/platform/symbian/mmp/scummvm_avalanche.mmp.in | 1 | ||||
| -rw-r--r-- | backends/platform/symbian/mmp/scummvm_cge2.mmp.in | 1 | ||||
| -rw-r--r-- | backends/platform/symbian/mmp/scummvm_tsage.mmp.in | 1 | ||||
| -rw-r--r-- | backends/platform/symbian/src/SymbianOS.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/symbian/src/portdefs.h | 1 |
6 files changed, 0 insertions, 21 deletions
diff --git a/backends/platform/symbian/mmp/config.mmh b/backends/platform/symbian/mmp/config.mmh index f397e5ec64..da91117cf6 100644 --- a/backends/platform/symbian/mmp/config.mmh +++ b/backends/platform/symbian/mmp/config.mmh @@ -29,19 +29,6 @@ // Common EPOC MMP makefiles option storage for ScummVM // -/* - * MACRO REMOVE_UNDEFINED used for bypass this bug - - * http://sourceforge.net/p/scummvm/bugs/6437/ - * Requre change in epoc32\include\libc\sys\unistd.h by - * - * #ifndef REMOVE_UNDEFINED - * #define remove(x) unlink(x) - * #define wremove(x) wunlink(x) - * #endif //REMOVE_UNDEFINED - * - * Affects Avalanche, CGE2 and Tsage - */ - // *** Definitions OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp diff --git a/backends/platform/symbian/mmp/scummvm_avalanche.mmp.in b/backends/platform/symbian/mmp/scummvm_avalanche.mmp.in index 49c73222ca..6d44c66bf7 100644 --- a/backends/platform/symbian/mmp/scummvm_avalanche.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_avalanche.mmp.in @@ -33,7 +33,6 @@ TARGET scummvm_avalanche.lib TARGETTYPE lib -MACRO REMOVE_UNDEFINED #include "config.mmh" //START_AUTO_MACROS_SLAVE// diff --git a/backends/platform/symbian/mmp/scummvm_cge2.mmp.in b/backends/platform/symbian/mmp/scummvm_cge2.mmp.in index 1561b0f479..7c78f47bfd 100644 --- a/backends/platform/symbian/mmp/scummvm_cge2.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_cge2.mmp.in @@ -32,7 +32,6 @@ TARGET scummvm_cge2.lib TARGETTYPE lib -MACRO REMOVE_UNDEFINED #include "config.mmh" //START_AUTO_MACROS_SLAVE// diff --git a/backends/platform/symbian/mmp/scummvm_tsage.mmp.in b/backends/platform/symbian/mmp/scummvm_tsage.mmp.in index 93f278e279..6b57827e1e 100644 --- a/backends/platform/symbian/mmp/scummvm_tsage.mmp.in +++ b/backends/platform/symbian/mmp/scummvm_tsage.mmp.in @@ -32,7 +32,6 @@ TARGET scummvm_tsage.lib TARGETTYPE lib -MACRO REMOVE_UNDEFINED #include "config.mmh" //START_AUTO_MACROS_SLAVE// diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index e28b78900c..4d417b5a66 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -197,7 +197,3 @@ void* scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size return NULL; } -int remove(const char *path) -{ - return unlink(path); -} diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h index f2faa7c878..d0769136b2 100644 --- a/backends/platform/symbian/src/portdefs.h +++ b/backends/platform/symbian/src/portdefs.h @@ -68,7 +68,6 @@ typedef signed long int int32; #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! |