diff options
| author | Max Horn | 2004-03-15 01:52:07 +0000 |
|---|---|---|
| committer | Max Horn | 2004-03-15 01:52:07 +0000 |
| commit | af80eef70e4f6ec3585425a9e0b8f3614cbbd57f (patch) | |
| tree | f89741d681c5447556f66e8d6bf155bbbc66b6fa /common/util.h | |
| parent | 2314cdf03635deb54e1b93eba32a914227f262d9 (diff) | |
| download | scummvm-rg350-af80eef70e4f6ec3585425a9e0b8f3614cbbd57f.tar.gz scummvm-rg350-af80eef70e4f6ec3585425a9e0b8f3614cbbd57f.tar.bz2 scummvm-rg350-af80eef70e4f6ec3585425a9e0b8f3614cbbd57f.zip | |
fix circular header dependency, by moving StackLock class to common/system.h (it ties closely into OSystem anyway)
svn-id: r13292
Diffstat (limited to 'common/util.h')
| -rw-r--r-- | common/util.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/common/util.h b/common/util.h index b602f3ef85..68c47a1fb5 100644 --- a/common/util.h +++ b/common/util.h @@ -22,7 +22,6 @@ #define COMMON_UTIL_H #include "common/scummsys.h" -#include "common/system.h" template<typename T> inline T ABS (T x) { return (x>=0) ? x : -x; } template<typename T> inline T MIN (T a, T b) { return (a<b) ? a : b; } @@ -76,21 +75,6 @@ public: }; /** - * Auxillary class to (un)lock a mutex on the stack. - */ -class StackLock { - OSystem::MutexRef _mutex; - OSystem *_syst; - const char *_mutexName; - - void lock(); - void unlock(); -public: - StackLock(OSystem::MutexRef mutex, OSystem *syst = 0, const char *mutexName = NULL); - ~StackLock(); -}; - -/** * List of language ids. * @note The order and mappings of the values 0..8 are *required* to stay the * way they are now, as scripts in COMI rely on them. So don't touch them. |