diff options
author | Torbjörn Andersson | 2005-01-11 13:25:02 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2005-01-11 13:25:02 +0000 |
commit | 4dda4eb31bbada527082b59295af0a20003d23e6 (patch) | |
tree | 93e1a452e33c07a588e0be42eee4afb21d65f165 /common | |
parent | c5e83de099dcffca0f5c0d791305c0189467e9d9 (diff) | |
download | scummvm-rg350-4dda4eb31bbada527082b59295af0a20003d23e6.tar.gz scummvm-rg350-4dda4eb31bbada527082b59295af0a20003d23e6.tar.bz2 scummvm-rg350-4dda4eb31bbada527082b59295af0a20003d23e6.zip |
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.
svn-id: r16541
Diffstat (limited to 'common')
-rw-r--r-- | common/rect.h | 1 | ||||
-rw-r--r-- | common/system.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/common/rect.h b/common/rect.h index bc70153ae4..66c7be738f 100644 --- a/common/rect.h +++ b/common/rect.h @@ -23,6 +23,7 @@ #define COMMON_RECT_H #include "common/scummsys.h" +#include "common/util.h" namespace Common { diff --git a/common/system.h b/common/system.h index b3e5a98a4a..7d3a0ea8f7 100644 --- a/common/system.h +++ b/common/system.h @@ -25,7 +25,6 @@ #include "common/scummsys.h" #include "common/mutex.h" -#include "common/util.h" #include "common/rect.h" #include "common/singleton.h" |