[Scummvm-cvs-logs] CVS: scummvm/common rect.h,1.23,1.24 system.h,1.85,1.86

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Tue Jan 11 05:26:10 CET 2005


Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24959/common

Modified Files:
	rect.h system.h 
Log Message:
On Fingolfin's suggestion I put back the inclusion of util.h into Rect, for
MIN() and MAX(). I then removed util.h from a bunch of files which I don't
think need it any more. (Please let me know if I got too blood-thirsty!)

This reverts some of the changes I made this morning.


Index: rect.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/rect.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- rect.h	10 Jan 2005 22:35:43 -0000	1.23
+++ rect.h	11 Jan 2005 13:25:00 -0000	1.24
@@ -23,6 +23,7 @@
 #define COMMON_RECT_H
 
 #include "common/scummsys.h"
+#include "common/util.h"
 
 namespace Common {
 

Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/system.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- system.h	11 Jan 2005 08:06:12 -0000	1.85
+++ system.h	11 Jan 2005 13:25:00 -0000	1.86
@@ -25,7 +25,6 @@
 
 #include "common/scummsys.h"
 #include "common/mutex.h"
-#include "common/util.h"
 #include "common/rect.h"
 #include "common/singleton.h"
 





More information about the Scummvm-git-logs mailing list