[Scummvm-cvs-logs] scummvm master -> b737dcbad5ae0fde2780f44c351fd342aa91d88b

fingolfin max at quendi.de
Tue May 3 11:58:25 CEST 2011


This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3d4e9fe674 BACKENDS: Allow various files to use stuff from time.h
eafc54869c PSP: Add FIXME to portdefs.h
bdc7414f80 COMMON: Don't declare a fake printf
d67e450f7a DC: Fix various forbidden symbol clashes
b737dcbad5 PSP: Fix various forbidden symbol clashes


Commit: 3d4e9fe674d2daf59ff4b481fc2f89f77b390a4f
    https://github.com/scummvm/scummvm/commit/3d4e9fe674d2daf59ff4b481fc2f89f77b390a4f
Author: Max Horn (max at quendi.de)
Date: 2011-05-03T02:27:44-07:00

Commit Message:
BACKENDS: Allow various files to use stuff from time.h

Changed paths:
    backends/events/webossdl/webossdl-events.cpp
    backends/platform/android/android.cpp
    backends/platform/dc/dcmain.cpp
    backends/platform/dc/vmsave.cpp
    backends/platform/ds/arm9/source/fat/gba_nds_fat.c
    backends/platform/ds/arm9/source/osystem_ds.cpp
    backends/platform/psp/osys_psp.cpp
    backends/platform/sdl/sdl.cpp
    backends/platform/wii/osystem.cpp



diff --git a/backends/events/webossdl/webossdl-events.cpp b/backends/events/webossdl/webossdl-events.cpp
index 045d077..24aa5f0 100644
--- a/backends/events/webossdl/webossdl-events.cpp
+++ b/backends/events/webossdl/webossdl-events.cpp
@@ -25,6 +25,9 @@
 
 #ifdef WEBOS
 
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "sys/time.h"
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index c7f62f5..7cf1e98 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -25,6 +25,9 @@
 
 #if defined(__ANDROID__)
 
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/system_properties.h>
diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp
index f964013..0f52cda 100644
--- a/backends/platform/dc/dcmain.cpp
+++ b/backends/platform/dc/dcmain.cpp
@@ -23,6 +23,9 @@
  *
  */
 
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
 #include <common/scummsys.h>
 #include <engines/engine.h>
 #include <base/main.h>
diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp
index 6c82896..1d7773b 100644
--- a/backends/platform/dc/vmsave.cpp
+++ b/backends/platform/dc/vmsave.cpp
@@ -23,6 +23,9 @@
  *
  */
 
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
 #include <common/scummsys.h>
 #include "engines/engine.h"
 #include "dc.h"
diff --git a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
index 7f0757e..6985904 100644
--- a/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
+++ b/backends/platform/ds/arm9/source/fat/gba_nds_fat.c
@@ -18,6 +18,9 @@
 //---------------------------------------------------------------
 // Includes
 
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
 #include "gba_nds_fat.h"
 #include "disc_io.h"
 #include <string.h>
diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index 49818a0..462990c 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -20,6 +20,9 @@
  */
 
 
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
 #include "common/scummsys.h"
 #include "common/system.h"
 
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp
index bb7c1ff..e2a8a88 100644
--- a/backends/platform/psp/osys_psp.cpp
+++ b/backends/platform/psp/osys_psp.cpp
@@ -23,6 +23,9 @@
  *
  */
 
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
 #include <pspuser.h>
 #include <pspgu.h>
 #include <pspdisplay.h>
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index bc27f8e..e6ca423 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -25,7 +25,6 @@
 
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 
-
 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
diff --git a/backends/platform/wii/osystem.cpp b/backends/platform/wii/osystem.cpp
index 54da271..ccf6b22 100644
--- a/backends/platform/wii/osystem.cpp
+++ b/backends/platform/wii/osystem.cpp
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+// Allow use of stuff in <time.h>
+#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
+
 #include <unistd.h>
 
 #include <ogc/conf.h>


Commit: eafc54869c5f581b4773cc9328d39672ad28d33a
    https://github.com/scummvm/scummvm/commit/eafc54869c5f581b4773cc9328d39672ad28d33a
Author: Max Horn (max at quendi.de)
Date: 2011-05-03T02:40:11-07:00

Commit Message:
PSP: Add FIXME to portdefs.h

Changed paths:
    backends/platform/psp/portdefs.h



diff --git a/backends/platform/psp/portdefs.h b/backends/platform/psp/portdefs.h
index bf7ed41..dae9b5d 100644
--- a/backends/platform/psp/portdefs.h
+++ b/backends/platform/psp/portdefs.h
@@ -26,6 +26,12 @@
 #ifndef PORTDEFS_H
 #define PORTDEFS_H
 
+// FIXME: This file is only used when building using the file
+// backends/platform/psp/Makefile, but not when building using configure
+// && make. So either -DNONSTANDARD_PORT needs to be added to the PSP
+// configure rules, or it should be removed from the aforementioned
+// Makefile.
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


Commit: bdc7414f80dbff795892d6a88963bdb2c12dbad7
    https://github.com/scummvm/scummvm/commit/bdc7414f80dbff795892d6a88963bdb2c12dbad7
Author: Max Horn (max at quendi.de)
Date: 2011-05-03T02:41:01-07:00

Commit Message:
COMMON: Don't declare a fake printf

Changed paths:
    common/textconsole.h



diff --git a/common/textconsole.h b/common/textconsole.h
index 963d674..5a535f3 100644
--- a/common/textconsole.h
+++ b/common/textconsole.h
@@ -66,8 +66,6 @@ void NORETURN_PRE error(const char *s, ...) GCC_PRINTF(1, 2) NORETURN_POST;
 
 #ifdef DISABLE_TEXT_CONSOLE
 
-inline int printf(const char *s, ...) { return 0; }
-
 inline void warning(const char *s, ...) {}
 
 #else


Commit: d67e450f7ab6a8bc7e174790bdf3b0dc1fff18ba
    https://github.com/scummvm/scummvm/commit/d67e450f7ab6a8bc7e174790bdf3b0dc1fff18ba
Author: Max Horn (max at quendi.de)
Date: 2011-05-03T02:56:10-07:00

Commit Message:
DC: Fix various forbidden symbol clashes

Changed paths:
    backends/platform/dc/dc-fs.cpp
    backends/platform/dc/dcmain.cpp
    backends/platform/dc/selector.cpp
    backends/platform/dc/vmsave.cpp



diff --git a/backends/platform/dc/dc-fs.cpp b/backends/platform/dc/dc-fs.cpp
index e21a12f..e07dfbf 100644
--- a/backends/platform/dc/dc-fs.cpp
+++ b/backends/platform/dc/dc-fs.cpp
@@ -22,6 +22,10 @@
  * $Id$
  */
 
+// Avoid clashes with unistd.h
+#define FORBIDDEN_SYMBOL_EXCEPTION_chdir
+#define FORBIDDEN_SYMBOL_EXCEPTION_unlink
+
 #include "dc.h"
 #include "backends/fs/abstract-fs.h"
 #include "backends/fs/stdiostream.h"
diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp
index 0f52cda..a3a1200 100644
--- a/backends/platform/dc/dcmain.cpp
+++ b/backends/platform/dc/dcmain.cpp
@@ -26,6 +26,8 @@
 // Allow use of stuff in <time.h>
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+
 #include <common/scummsys.h>
 #include <engines/engine.h>
 #include <base/main.h>
diff --git a/backends/platform/dc/selector.cpp b/backends/platform/dc/selector.cpp
index 8fd12d6..77f3439 100644
--- a/backends/platform/dc/selector.cpp
+++ b/backends/platform/dc/selector.cpp
@@ -23,6 +23,8 @@
  *
  */
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_chdir
+
 #include <common/scummsys.h>
 #include <engines/engine.h>
 #include <engines/metaengine.h>
diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp
index 1d7773b..63e345e 100644
--- a/backends/platform/dc/vmsave.cpp
+++ b/backends/platform/dc/vmsave.cpp
@@ -26,6 +26,8 @@
 // Allow use of stuff in <time.h>
 #define FORBIDDEN_SYMBOL_EXCEPTION_time_h
 
+#define FORBIDDEN_SYMBOL_EXCEPTION_fprintf
+
 #include <common/scummsys.h>
 #include "engines/engine.h"
 #include "dc.h"


Commit: b737dcbad5ae0fde2780f44c351fd342aa91d88b
    https://github.com/scummvm/scummvm/commit/b737dcbad5ae0fde2780f44c351fd342aa91d88b
Author: Max Horn (max at quendi.de)
Date: 2011-05-03T02:56:17-07:00

Commit Message:
PSP: Fix various forbidden symbol clashes

Changed paths:
    backends/platform/psp/display_client.cpp
    backends/platform/psp/mp3.cpp
    backends/platform/psp/psp_main.cpp
    backends/platform/psp/trace.cpp



diff --git a/backends/platform/psp/display_client.cpp b/backends/platform/psp/display_client.cpp
index 76b4a28..d43e876 100644
--- a/backends/platform/psp/display_client.cpp
+++ b/backends/platform/psp/display_client.cpp
@@ -23,6 +23,20 @@
  *
  */
 
+// Disable printf override in common/forbidden.h to avoid
+// clashes with pspdebug.h from the PSP SDK.
+// That header file uses
+//   __attribute__((format(printf,1,2)));
+// which gets messed up by our override mechanism; this could
+// be avoided by either changing the PSP SDK to use the equally
+// legal and valid
+//   __attribute__((format(__printf__,1,2)));
+// or by refining our printf override to use a varadic macro
+// (which then wouldn't be portable, though).
+// Anyway, for now we just disable the printf override globally
+// for the PSP port
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+
 #include <pspgu.h>
 #include <pspkerneltypes.h>
 #include <pspdisplay.h>
diff --git a/backends/platform/psp/mp3.cpp b/backends/platform/psp/mp3.cpp
index 0faeacb..fd68651 100644
--- a/backends/platform/psp/mp3.cpp
+++ b/backends/platform/psp/mp3.cpp
@@ -23,6 +23,19 @@
  *
  */
 
+// Disable printf override in common/forbidden.h to avoid
+// clashes with pspdebug.h from the PSP SDK.
+// That header file uses
+//   __attribute__((format(printf,1,2)));
+// which gets messed up by our override mechanism; this could
+// be avoided by either changing the PSP SDK to use the equally
+// legal and valid
+//   __attribute__((format(__printf__,1,2)));
+// or by refining our printf override to use a varadic macro
+// (which then wouldn't be portable, though).
+// Anyway, for now we just disable the printf override globally
+// for the PSP port
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
 
 #include "common/debug.h"
 #include "common/stream.h"
diff --git a/backends/platform/psp/psp_main.cpp b/backends/platform/psp/psp_main.cpp
index d24c614..b85467f 100644
--- a/backends/platform/psp/psp_main.cpp
+++ b/backends/platform/psp/psp_main.cpp
@@ -23,6 +23,20 @@
  *
  */
 
+// Disable printf override in common/forbidden.h to avoid
+// clashes with pspdebug.h from the PSP SDK.
+// That header file uses
+//   __attribute__((format(printf,1,2)));
+// which gets messed up by our override mechanism; this could
+// be avoided by either changing the PSP SDK to use the equally
+// legal and valid
+//   __attribute__((format(__printf__,1,2)));
+// or by refining our printf override to use a varadic macro
+// (which then wouldn't be portable, though).
+// Anyway, for now we just disable the printf override globally
+// for the PSP port
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
+
 #define	USERSPACE_ONLY	//don't use kernel mode features
 
 #ifndef USERSPACE_ONLY
diff --git a/backends/platform/psp/trace.cpp b/backends/platform/psp/trace.cpp
index 74c2f64..92ee7b6 100644
--- a/backends/platform/psp/trace.cpp
+++ b/backends/platform/psp/trace.cpp
@@ -23,6 +23,19 @@
  *
  */
 
+// Disable printf override in common/forbidden.h to avoid
+// clashes with pspdebug.h from the PSP SDK.
+// That header file uses
+//   __attribute__((format(printf,1,2)));
+// which gets messed up by our override mechanism; this could
+// be avoided by either changing the PSP SDK to use the equally
+// legal and valid
+//   __attribute__((format(__printf__,1,2)));
+// or by refining our printf override to use a varadic macro
+// (which then wouldn't be portable, though).
+// Anyway, for now we just disable the printf override globally
+// for the PSP port
+#define FORBIDDEN_SYMBOL_EXCEPTION_printf
 
 #include <pspkernel.h>
 #include <pspdebug.h>






More information about the Scummvm-git-logs mailing list