libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 20:17:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PSP: Fix more forbidden symbol clashes

Browse Source
This commit is contained in:
Max Horn 2011-05-03 14:14:21 +02:00
parent 48bbdd1708
commit ff6533e1b3
4 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
backends/fs/psp/psp-fs-factory.cpp
View File

@ -24,8 +24,29 @@
#if defined(__PSP__) #if defined(__PSP__)
// 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
// Avoid clashes with unistd.h
#define FORBIDDEN_SYMBOL_EXCEPTION_chdir
#define FORBIDDEN_SYMBOL_EXCEPTION_unlink
#include "backends/fs/psp/psp-fs-factory.h" #include "backends/fs/psp/psp-fs-factory.h"
#include "backends/fs/psp/psp-fs.h" #include "backends/fs/psp/psp-fs.h"
#include "backends/platform/psp/powerman.h"
#include <unistd.h>
DECLARE_SINGLETON(PSPFilesystemFactory); DECLARE_SINGLETON(PSPFilesystemFactory);

22
backends/fs/psp/psp-fs.cpp
View File

@ -24,6 +24,28 @@
#if defined(__PSP__) #if defined(__PSP__)
// 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 FORBIDDEN_SYMBOL_EXCEPTION_time_h
#define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
// Avoid clashes with unistd.h
#define FORBIDDEN_SYMBOL_EXCEPTION_chdir
#define FORBIDDEN_SYMBOL_EXCEPTION_unlink
#include "backends/fs/psp/psp-fs.h" #include "backends/fs/psp/psp-fs.h"
#include "backends/fs/psp/psp-stream.h" #include "backends/fs/psp/psp-stream.h"
#include "common/bufferedstream.h" #include "common/bufferedstream.h"

14
backends/saves/psp/psp-saves.cpp
View File

@ -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 "common/scummsys.h" #include "common/scummsys.h"
#ifdef __PSP__ #ifdef __PSP__

14
backends/timer/psp/timer.cpp
View File

@ -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 "common/scummsys.h" #include "common/scummsys.h"
#if defined (__PSP__) #if defined (__PSP__)