PSP: A couple of small fixes to the debugging support

svn-id: r48793

2 files changed, 9 insertions, 8 deletions

diff --git a/backends/platform/psp/display_manager.cpp b/backends/platform/psp/display_manager.cpp
index 890e683559..c11604c273 100644
--- a/backends/platform/psp/display_manager.cpp
+++ b/backends/platform/psp/display_manager.cpp
@@ -23,13 +23,6 @@
  *
  */
 
-//#define __PSP_DEBUG_FUNCS__	/* For debugging function calls */
-//#define __PSP_DEBUG_PRINT__	/* For debug printouts */
-
-//#define ENABLE_RENDER_MEASURE
-
-#include "backends/platform/psp/trace.h"
-
 #include <pspgu.h>
 #include <pspdisplay.h>
 
@@ -46,6 +39,13 @@
 #define	PSP_SCREEN_HEIGHT	272
 #define PSP_FRAME_SIZE (PSP_BUFFER_WIDTH * PSP_SCREEN_HEIGHT)
 
+//#define ENABLE_RENDER_MEASURE /* how long it takes to render a frame */
+
+//#define __PSP_DEBUG_FUNCS__	/* For debugging function calls */
+//#define __PSP_DEBUG_PRINT__	/* For debug printouts */
+
+#include "backends/platform/psp/trace.h"
+
 uint32 __attribute__((aligned(16))) MasterGuRenderer::_displayList[2048];
 
 const OSystem::GraphicsMode DisplayManager::_supportedModes[] = {
diff --git a/backends/platform/psp/trace.h b/backends/platform/psp/trace.h
index 4e2a20c199..ab33aaa250 100644
--- a/backends/platform/psp/trace.h
+++ b/backends/platform/psp/trace.h
@@ -103,6 +103,7 @@ extern int psp_debug_indent;
 
 // We use this class to print out function calls on the stack in an easy way.
 //
+#include "common/str.h"
 class PSPStackDebugFuncs {
     Common::String _name;
 
@@ -117,7 +118,7 @@ public:
 		if (psp_debug_indent < 0) PSP_ERROR("debug indent < 0\n"); \
 		PSP_INFO_PRINT_INDENT("-- %s\n", _name.c_str());
 	}
-}
+};
 
 /* We don't need anything but this line at the beginning of each function to debug function calls */
 	#define DEBUG_ENTER_FUNC()					PSPStackDebugFuncs(__PRETTY_FUNCTION__)