ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Soren Jorvang 2011-03-14 15:06:06 +00:00
parent 4ccb31e7af d93055a7ad
commit bfe7b028ce
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/Src/StdMutex.h
View File

@ -56,6 +56,7 @@ public:
InitializeCriticalSection(&m_handle); InitializeCriticalSection(&m_handle);
#else #else
pthread_mutexattr_t attr; pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
pthread_mutex_init(&m_handle, &attr); pthread_mutex_init(&m_handle, &attr);
#endif #endif
@ -157,17 +158,16 @@ public:
#endif #endif
} }
#ifdef __linux__
// TryAcquireSRWLockExclusive requires Windows 7!!
bool try_lock() bool try_lock()
{ {
#ifdef _WIN32 #ifdef _WIN32
return (0 != TryAcquireSRWLockExclusive(&m_handle)); // XXX TryAcquireSRWLockExclusive requires Windows 7!
// return (0 != TryAcquireSRWLockExclusive(&m_handle));
return false;
#else #else
return !pthread_mutex_trylock(&m_handle); return !pthread_mutex_trylock(&m_handle);
#endif #endif
} }
#endif
native_handle_type native_handle() native_handle_type native_handle()
{ {

2
Source/Core/Core/SConscript
View File

@ -77,7 +77,7 @@ files = [
'Src/HW/DSPLLE/DSPDebugInterface.cpp', 'Src/HW/DSPLLE/DSPDebugInterface.cpp',
'Src/HW/DSPLLE/DSPHost.cpp', 'Src/HW/DSPLLE/DSPHost.cpp',
'Src/HW/DSPLLE/DSPLLE.cpp', 'Src/HW/DSPLLE/DSPLLE.cpp',
'Src/HW/DSPLLE/DSPLLEGlobals.cpp', #'Src/HW/DSPLLE/DSPLLEGlobals.cpp',
'Src/HW/DSPLLE/DSPLLETools.cpp', 'Src/HW/DSPLLE/DSPLLETools.cpp',
'Src/HW/DSPLLE/DSPSymbols.cpp', 'Src/HW/DSPLLE/DSPSymbols.cpp',
'Src/HW/DVDInterface.cpp', 'Src/HW/DVDInterface.cpp',