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',