diff options
| author | Max Horn | 2011-05-03 14:14:21 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-03 14:14:21 +0200 |
| commit | ff6533e1b3d9d65397ccc1876a0849075aad2430 (patch) | |
| tree | 497c50c369e580365ef9b7d5a9cb6e1aad0b9f0b /backends/timer | |
| parent | 48bbdd17082d79081787b6892889337a6dd52b24 (diff) | |
| download | scummvm-rg350-ff6533e1b3d9d65397ccc1876a0849075aad2430.tar.gz scummvm-rg350-ff6533e1b3d9d65397ccc1876a0849075aad2430.tar.bz2 scummvm-rg350-ff6533e1b3d9d65397ccc1876a0849075aad2430.zip | |
PSP: Fix more forbidden symbol clashes
Diffstat (limited to 'backends/timer')
| -rw-r--r-- | backends/timer/psp/timer.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/backends/timer/psp/timer.cpp b/backends/timer/psp/timer.cpp index 746ff97197..9e36b43490 100644 --- a/backends/timer/psp/timer.cpp +++ b/backends/timer/psp/timer.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 "common/scummsys.h" #if defined (__PSP__) |