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

svn-id: r10149

4 files changed, 13 insertions, 13 deletions

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