diff options
author | Vicent Marti | 2008-06-14 14:44:29 +0000 |
---|---|---|
committer | Vicent Marti | 2008-06-14 14:44:29 +0000 |
commit | d0b27cf9c66b9281899acf826cb205e19dcb7260 (patch) | |
tree | 74e813b1d1f081f35f41ca7a95da5d048951b9e7 /common/util.h | |
parent | d51a0cab3fe494698f001d81d5d86cea7cd0395b (diff) | |
parent | 91d3ea31359950b59ee46af8355cc0f5790257e5 (diff) | |
download | scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.gz scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.bz2 scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.zip |
Merged trunk into the GUI branch.
Fixed MSVS9 project files.
svn-id: r32702
Diffstat (limited to 'common/util.h')
-rw-r--r-- | common/util.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/common/util.h b/common/util.h index 1f680d28c1..c23513596c 100644 --- a/common/util.h +++ b/common/util.h @@ -27,7 +27,7 @@ #include "common/scummsys.h" #include "common/str.h" -#include "common/array.h" +#include "common/list.h" #ifdef MIN #undef MIN @@ -308,11 +308,13 @@ void enableSpecialDebugLevelList(const String &option); */ bool disableSpecialDebugLevel(const String &option); +typedef List<EngineDebugLevel> DebugLevelContainer; + /** * Lists all debug levels * @return returns a arry with all debug levels */ -const Array<EngineDebugLevel> &listSpecialDebugLevels(); +const DebugLevelContainer &listSpecialDebugLevels(); /** * Return the active debug flag mask (i.e. all active debug flags ORed |