diff options
| author | sapier <Sapier at GMX dot net> | 2013-12-01 01:52:06 +0100 |
|---|---|---|
| committer | sapier <Sapier at GMX dot net> | 2013-12-01 16:25:46 +0100 |
| commit | 04e9a9d5410a151d232a577b46791d2edffba527 (patch) | |
| tree | 26d014a8ba5a9d962f9458f11d23f11f09ab5fff /src/jthread/win32/jmutex.cpp | |
| parent | f3439c40d85967c4f66eeefbc325f9ebf94d75e1 (diff) | |
| download | minetest-04e9a9d5410a151d232a577b46791d2edffba527.tar.gz minetest-04e9a9d5410a151d232a577b46791d2edffba527.tar.bz2 minetest-04e9a9d5410a151d232a577b46791d2edffba527.zip | |
Cleanup jthread and fix win32 build
Diffstat (limited to 'src/jthread/win32/jmutex.cpp')
| -rw-r--r-- | src/jthread/win32/jmutex.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/jthread/win32/jmutex.cpp b/src/jthread/win32/jmutex.cpp index 8a31495cd..b9f5e0e73 100644 --- a/src/jthread/win32/jmutex.cpp +++ b/src/jthread/win32/jmutex.cpp @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ - +#include <assert.h> #include "jthread/jmutex.h" JMutex::JMutex() @@ -33,31 +33,21 @@ JMutex::JMutex() InitializeCriticalSection(&mutex); #else mutex = CreateMutex(NULL,FALSE,NULL); - if (mutex == NULL) - return ERR_JMUTEX_CANTCREATEMUTEX; + assert(mutex != NULL); #endif // JMUTEX_CRITICALSECTION - initialized = true; } JMutex::~JMutex() { - if (initialized) #ifdef JMUTEX_CRITICALSECTION - DeleteCriticalSection(&mutex); + DeleteCriticalSection(&mutex); #else - CloseHandle(mutex); + CloseHandle(mutex); #endif // JMUTEX_CRITICALSECTION } -int JMutex::Init() -{ - return 0; -} - int JMutex::Lock() { - if (!initialized) - return ERR_JMUTEX_NOTINIT; #ifdef JMUTEX_CRITICALSECTION EnterCriticalSection(&mutex); #else @@ -68,8 +58,6 @@ int JMutex::Lock() int JMutex::Unlock() { - if (!initialized) - return ERR_JMUTEX_NOTINIT; #ifdef JMUTEX_CRITICALSECTION LeaveCriticalSection(&mutex); #else |