From ff6533e1b3d9d65397ccc1876a0849075aad2430 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 3 May 2011 14:14:21 +0200
Subject: PSP: Fix more forbidden symbol clashes

---
 backends/timer/psp/timer.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'backends/timer')

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__)
-- 
cgit v1.2.3