thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved mutex stuff into a seperate header

Browse source 
svn-id: r16526
This commit is contained in:
Max Horn 2005-01-10 22:04:04 +00:00
parent 788c828026
commit e794581308
2 changed files with 55 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

52
common/mutex.h Normal file
View file

@ -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

22
common/system.h
View file

@ -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"
@ -542,7 +543,7 @@ public:
*/
//@{
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