[Scummvm-cvs-logs] scummvm master -> 97aa214e89b4005a3d08ca5a7246e7bf8597e1c1
wjp
wjp at usecode.org
Mon Sep 14 22:49:16 CEST 2015
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
99d6dec059 SYMBIAN: Fix compilation error caused by remove macro
c7aa5cb995 SYMBIAN: Delete obsolete fixes for 'remove'
bf822e7dc0 SYMBIAN: Rename define and rephrase comments
97aa214e89 Merge branch 'fix_remove_error'
Commit: 99d6dec0597b190c76fc49169a4e5c2e93f7d366
https://github.com/scummvm/scummvm/commit/99d6dec0597b190c76fc49169a4e5c2e93f7d366
Author: Fedor Strizhnev (fedor_qd at mail.ru)
Date: 2015-09-14T22:43:09+02:00
Commit Message:
SYMBIAN: Fix compilation error caused by remove macro
Changed paths:
backends/platform/symbian/src/portdefs.h
backends/saves/default/default-saves.cpp
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h
index 1fb9419..f2faa7c 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 1b955a5..cca7535 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)
Commit: c7aa5cb995a41f9e4c72b37533277c1b4c9476fc
https://github.com/scummvm/scummvm/commit/c7aa5cb995a41f9e4c72b37533277c1b4c9476fc
Author: Fedor Strizhnev (fedor_qd at mail.ru)
Date: 2015-09-14T22:43:35+02:00
Commit Message:
SYMBIAN: Delete obsolete fixes for 'remove'
Changed paths:
backends/platform/symbian/mmp/config.mmh
backends/platform/symbian/mmp/scummvm_avalanche.mmp.in
backends/platform/symbian/mmp/scummvm_cge2.mmp.in
backends/platform/symbian/mmp/scummvm_tsage.mmp.in
backends/platform/symbian/src/SymbianOS.cpp
backends/platform/symbian/src/portdefs.h
diff --git a/backends/platform/symbian/mmp/config.mmh b/backends/platform/symbian/mmp/config.mmh
index f397e5e..da91117 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 49c7322..6d44c66 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 1561b0f..7c78f47 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 93f278e..6b57827 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 e28b789..4d417b5 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 f2faa7c..d076913 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!
Commit: bf822e7dc03327da937cb37cb4cc9f9e1af3f4b5
https://github.com/scummvm/scummvm/commit/bf822e7dc03327da937cb37cb4cc9f9e1af3f4b5
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2015-09-14T22:46:19+02:00
Commit Message:
SYMBIAN: Rename define and rephrase comments
Changed paths:
backends/platform/symbian/src/portdefs.h
backends/saves/default/default-saves.cpp
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h
index d076913..f9da09d 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 cca7535..4f70137 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"
Commit: 97aa214e89b4005a3d08ca5a7246e7bf8597e1c1
https://github.com/scummvm/scummvm/commit/97aa214e89b4005a3d08ca5a7246e7bf8597e1c1
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2015-09-14T22:46:38+02:00
Commit Message:
Merge branch 'fix_remove_error'
This is a manual merge of pull request #614, with an added commit.
Changed paths:
backends/platform/symbian/mmp/config.mmh
backends/platform/symbian/mmp/scummvm_avalanche.mmp.in
backends/platform/symbian/mmp/scummvm_cge2.mmp.in
backends/platform/symbian/mmp/scummvm_tsage.mmp.in
backends/platform/symbian/src/SymbianOS.cpp
backends/platform/symbian/src/portdefs.h
backends/saves/default/default-saves.cpp
More information about the Scummvm-git-logs
mailing list