diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-03-14 15:06:06 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-03-14 15:06:06 +0000 |
| commit | bfe7b028ce5406df1f271b667e225725de1ea5db (patch) | |
| tree | d8293609c17c9229aff6d87cd02620c7c9509d9e /Source/Core | |
| parent | 4ccb31e7af51695bde6d00c560dd201406ad5a07 (diff) | |
| parent | d93055a7ad3778bd44d7d93d20d250c10b137c69 (diff) | |
pthread_mutexattr_t's must be initialized before the type can be set.
Fixes issue 4243.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7344 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/Src/StdMutex.h | 8 | ||||
| -rw-r--r-- | Source/Core/Core/SConscript | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/Common/Src/StdMutex.h b/Source/Core/Common/Src/StdMutex.h index 4f79ca8f39..150d18f53e 100644 --- a/Source/Core/Common/Src/StdMutex.h +++ b/Source/Core/Common/Src/StdMutex.h @@ -56,6 +56,7 @@ public: InitializeCriticalSection(&m_handle); #else pthread_mutexattr_t attr; + pthread_mutexattr_init(&attr); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); pthread_mutex_init(&m_handle, &attr); #endif @@ -157,17 +158,16 @@ public: #endif } -#ifdef __linux__ - // TryAcquireSRWLockExclusive requires Windows 7!! bool try_lock() { #ifdef _WIN32 - return (0 != TryAcquireSRWLockExclusive(&m_handle)); + // XXX TryAcquireSRWLockExclusive requires Windows 7! + // return (0 != TryAcquireSRWLockExclusive(&m_handle)); + return false; #else return !pthread_mutex_trylock(&m_handle); #endif } -#endif native_handle_type native_handle() { diff --git a/Source/Core/Core/SConscript b/Source/Core/Core/SConscript index a33a94a1b5..2f1cf50041 100644 --- a/Source/Core/Core/SConscript +++ b/Source/Core/Core/SConscript @@ -77,7 +77,7 @@ files = [ 'Src/HW/DSPLLE/DSPDebugInterface.cpp', 'Src/HW/DSPLLE/DSPHost.cpp', 'Src/HW/DSPLLE/DSPLLE.cpp', - 'Src/HW/DSPLLE/DSPLLEGlobals.cpp', + #'Src/HW/DSPLLE/DSPLLEGlobals.cpp', 'Src/HW/DSPLLE/DSPLLETools.cpp', 'Src/HW/DSPLLE/DSPSymbols.cpp', 'Src/HW/DVDInterface.cpp', |