diff options
| author | Torbjörn Andersson | 2005-01-11 08:06:19 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-01-11 08:06:19 +0000 |
| commit | 13e2c224c89b618df01ec1cfb2767a77bb08b8af (patch) | |
| tree | 470c02876d023f37d6e78ee9f68708851512e005 | |
| parent | 872a032ee9820ea3c04820d5eee318a4a21b1d25 (diff) | |
| download | scummvm-rg350-13e2c224c89b618df01ec1cfb2767a77bb08b8af.tar.gz scummvm-rg350-13e2c224c89b618df01ec1cfb2767a77bb08b8af.tar.bz2 scummvm-rg350-13e2c224c89b618df01ec1cfb2767a77bb08b8af.zip | |
This is probably not the optimal fix, but at least ScummVM compiles again.
svn-id: r16538
| -rw-r--r-- | common/system.h | 1 | ||||
| -rw-r--r-- | graphics/surface.h | 1 | ||||
| -rw-r--r-- | scumm/charset.h | 2 | ||||
| -rw-r--r-- | scumm/player_v1.cpp | 2 | ||||
| -rw-r--r-- | scumm/scumm.h | 2 | ||||
| -rw-r--r-- | sound/audiostream.h | 1 | ||||
| -rw-r--r-- | sword2/controls.cpp | 1 |
7 files changed, 7 insertions, 3 deletions
diff --git a/common/system.h b/common/system.h index 7d3a0ea8f7..b3e5a98a4a 100644 --- a/common/system.h +++ b/common/system.h @@ -25,6 +25,7 @@ #include "common/scummsys.h" #include "common/mutex.h" +#include "common/util.h" #include "common/rect.h" #include "common/singleton.h" diff --git a/graphics/surface.h b/graphics/surface.h index 8cd93298d1..a6790b40b2 100644 --- a/graphics/surface.h +++ b/graphics/surface.h @@ -22,6 +22,7 @@ #define GRAPHICS_SURFACE_H #include "common/scummsys.h" +#include "common/util.h" #include "common/rect.h" namespace Graphics { diff --git a/scumm/charset.h b/scumm/charset.h index d3dfdba095..c2e5d1474b 100644 --- a/scumm/charset.h +++ b/scumm/charset.h @@ -22,8 +22,8 @@ #define CHARSET_H #include "common/scummsys.h" -#include "common/rect.h" #include "common/util.h" +#include "common/rect.h" #include "scumm/gfx.h" namespace Scumm { diff --git a/scumm/player_v1.cpp b/scumm/player_v1.cpp index 151f0345d6..f3a013a59c 100644 --- a/scumm/player_v1.cpp +++ b/scumm/player_v1.cpp @@ -22,8 +22,8 @@ #include "stdafx.h" #include "base/engine.h" -#include "scumm/player_v1.h" #include "scumm/scumm.h" +#include "scumm/player_v1.h" namespace Scumm { diff --git a/scumm/scumm.h b/scumm/scumm.h index 897f090176..9adf3e2f69 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -26,9 +26,9 @@ #include "base/engine.h" #include "common/file.h" #include "common/map.h" +#include "common/util.h" #include "common/rect.h" #include "common/str.h" -#include "common/util.h" #include "scumm/gfx.h" #include "scumm/script.h" diff --git a/sound/audiostream.h b/sound/audiostream.h index 12e1240f7e..df51d11897 100644 --- a/sound/audiostream.h +++ b/sound/audiostream.h @@ -23,6 +23,7 @@ #define AUDIOSTREAM_H #include "stdafx.h" +#include "common/util.h" #include "common/scummsys.h" diff --git a/sword2/controls.cpp b/sword2/controls.cpp index 459f413846..7ef4049a72 100644 --- a/sword2/controls.cpp +++ b/sword2/controls.cpp @@ -18,6 +18,7 @@ */ #include "common/stdafx.h" +#include "common/util.h" #include "common/rect.h" #include "common/config-manager.h" #include "common/system.h" |