diff options
| -rw-r--r-- | common/mutex.h | 52 | ||||
| -rw-r--r-- | common/system.h | 24 |
2 files changed, 55 insertions, 21 deletions
diff --git a/common/mutex.h b/common/mutex.h new file mode 100644 index 0000000000..6b7ba55851 --- /dev/null +++ b/common/mutex.h @@ -0,0 +1,52 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2003-2005 The ScummVM project + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * $Header$ + * + */ + +#ifndef COMMON_MUTEX_H +#define COMMON_MUTEX_H + +#include "common/scummsys.h" + +namespace Common { + +/** + * An pseudo-opaque mutex type. See OSystem::createMutex etc. for more details. + */ +typedef struct Mutex *MutexRef; + + +/** + * Auxillary class to (un)lock a mutex on the stack. + */ +class StackLock { + MutexRef _mutex; + const char *_mutexName; + + void lock(); + void unlock(); +public: + StackLock(MutexRef mutex, const char *mutexName = NULL); + ~StackLock(); +}; + + +} // End of namespace Common + +#endif diff --git a/common/system.h b/common/system.h index 2e3693c1a9..02f432c98f 100644 --- a/common/system.h +++ b/common/system.h @@ -25,6 +25,7 @@ #include "common/scummsys.h" #include "common/util.h" +#include "common/mutex.h" #include "common/rect.h" #include "common/savefile.h" #include "common/singleton.h" @@ -541,8 +542,8 @@ public: * can use dummy implementations for these methods. */ //@{ - - typedef struct Mutex *MutexRef; + + typedef Common::MutexRef MutexRef; /** * Create a new mutex. @@ -679,27 +680,8 @@ public: }; - /** The global OSystem instance. Inited in main(). */ #define g_system (&OSystem::instance()) -namespace Common { - -/** - * Auxillary class to (un)lock a mutex on the stack. - */ -class StackLock { - OSystem::MutexRef _mutex; - const char *_mutexName; - - void lock(); - void unlock(); -public: - StackLock(OSystem::MutexRef mutex, const char *mutexName = NULL); - ~StackLock(); -}; - -} // End of namespace Common - #endif |