[Scummvm-cvs-logs] CVS: scummvm/common engine.h,1.35,1.36 util.h,1.23,1.24

Max Horn fingolfin at users.sourceforge.net
Wed Sep 10 05:16:51 CEST 2003


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv12403

Modified Files:
	engine.h util.h 
Log Message:
moved declaration of error/warning/debug from engine.h to util.h

Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/engine.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- engine.h	8 Sep 2003 17:13:40 -0000	1.35
+++ engine.h	10 Sep 2003 12:15:12 -0000	1.36
@@ -81,16 +81,5 @@
 
 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
 

Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- util.h	1 Aug 2003 12:18:35 -0000	1.23
+++ util.h	10 Sep 2003 12:15:12 -0000	1.24
@@ -89,4 +89,17 @@
 };
 
 
+
+#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





More information about the Scummvm-git-logs mailing list