moved declaration of error/warning/debug from engine.h to util.h

svn-id: r10149

backends/sdl/sdl-common.cpp

@@ -22,7 +22,6 @@
 #include "sdl-common.h"
 #include "sound/mididrv.h"
 #include "common/scaler.h"
-#include "common/engine.h"	// Only #included for error() and warning()
 #include "common/util.h"
 
 #include "scummvm.xpm"

backends/sdl/sdl.cpp

@@ -23,7 +23,6 @@
 #include "sdl-common.h"
 #include "common/scaler.h"
 #include "common/util.h"
-#include "common/engine.h"	// Only #included for error() and warning()
 
 class OSystem_SDL : public OSystem_SDL_Common {
 public:

backends/sdl/sdl_gl.cpp

@@ -23,7 +23,6 @@
 #include "sdl-common.h"
 #include "common/scaler.h"
 #include "common/util.h"
-#include "common/engine.h"	// Only #included for error() and warning()
 
 #ifdef WIN32
 int glColorTable(int, int, int, int, int, void *) { return 0; }

common/engine.h

@@ -81,16 +81,5 @@ public:
 
 extern Engine *g_engine;
 
-#if defined(__GNUC__)
-void CDECL error(const char *s, ...) NORETURN;
-#else
-void CDECL NORETURN error(const char *s, ...);
-#endif
-
-void CDECL warning(const char *s, ...);
-
-void CDECL debug(int level, const char *s, ...);
-void checkHeap();
-
 #endif
 

common/file.cpp

@@ -21,7 +21,6 @@
 
 #include "common/file.h"
 #include "common/util.h"
-#include "common/engine.h"	// For debug/warning/error
 
 FILE *File::fopenNoCase(const char *filename, const char *directory, const char *mode) {
 	FILE *file;

common/savefile.cpp

@@ -21,7 +21,6 @@
 
 #include "common/savefile.h"
 #include "common/util.h"
-#include "common/engine.h"	// For debug/warning/error
 
 uint32 SaveFile::read(void *ptr, uint32 size)
 {

common/util.h

@@ -89,4 +89,17 @@ public:
 };
 
 
+
+#if defined(__GNUC__)
+void CDECL error(const char *s, ...) NORETURN;
+#else
+void CDECL NORETURN error(const char *s, ...);
+#endif
+
+void CDECL warning(const char *s, ...);
+
+void CDECL debug(int level, const char *s, ...);
+void checkHeap();
+
+
 #endif