aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-09-10 12:15:51 +0000
committerMax Horn2003-09-10 12:15:51 +0000
commit110152ddcf0ba53528b7f8eaa0a96f2e8349841c (patch)
tree22a51f27c9f433bed4e8c2aa475212caf99c69ba
parent77ae18255bb5ac555087ee3314e8ea9c02a6c436 (diff)
downloadscummvm-rg350-110152ddcf0ba53528b7f8eaa0a96f2e8349841c.tar.gz
scummvm-rg350-110152ddcf0ba53528b7f8eaa0a96f2e8349841c.tar.bz2
scummvm-rg350-110152ddcf0ba53528b7f8eaa0a96f2e8349841c.zip
moved declaration of error/warning/debug from engine.h to util.h
svn-id: r10149
-rw-r--r--backends/sdl/sdl-common.cpp1
-rw-r--r--backends/sdl/sdl.cpp1
-rw-r--r--backends/sdl/sdl_gl.cpp1
-rw-r--r--common/engine.h11
-rw-r--r--common/file.cpp1
-rw-r--r--common/savefile.cpp1
-rw-r--r--common/util.h13
7 files changed, 13 insertions, 16 deletions
diff --git a/backends/sdl/sdl-common.cpp b/backends/sdl/sdl-common.cpp
index 818861a25d..90f1cfe45a 100644
--- a/backends/sdl/sdl-common.cpp
+++ b/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"
diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp
index b888bcf253..daf4a58b0d 100644
--- a/backends/sdl/sdl.cpp
+++ b/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:
diff --git a/backends/sdl/sdl_gl.cpp b/backends/sdl/sdl_gl.cpp
index 5df8440713..35c398ead5 100644
--- a/backends/sdl/sdl_gl.cpp
+++ b/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; }
diff --git a/common/engine.h b/common/engine.h
index 58559dd4b5..bcab61efc6 100644
--- a/common/engine.h
+++ b/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
diff --git a/common/file.cpp b/common/file.cpp
index ee1c288ccb..e6378f7f40 100644
--- a/common/file.cpp
+++ b/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;
diff --git a/common/savefile.cpp b/common/savefile.cpp
index 7d99f0e5d3..38aef7891c 100644
--- a/common/savefile.cpp
+++ b/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)
{
diff --git a/common/util.h b/common/util.h
index fe35ee38a4..14ab36f4b0 100644
--- a/common/util.h
+++ b/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