From 55c898b8808db76075889b270bec45548c4776f7 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 9 Feb 2015 03:55:29 +0100 Subject: [PATCH] rthreads.c - Take out code that is prone to deadlocks --- libretro-sdk/rthreads/rthreads.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/libretro-sdk/rthreads/rthreads.c b/libretro-sdk/rthreads/rthreads.c index dba556f857..762c9b6809 100644 --- a/libretro-sdk/rthreads/rthreads.c +++ b/libretro-sdk/rthreads/rthreads.c @@ -313,12 +313,7 @@ void scond_wait(scond_t *cond, slock_t *lock) #ifdef _WIN32 WaitForSingleObject(cond->event, 0); -#if MSC_VER <= 1310 - slock_unlock(lock); - WaitForSingleObject(cond->event, INFINITE); -#else SignalObjectAndWait(lock->lock, cond->event, INFINITE, FALSE); -#endif slock_lock(lock); #else pthread_cond_wait(&cond->cond, &lock->lock); @@ -378,13 +373,8 @@ bool scond_wait_timeout(scond_t *cond, slock_t *lock, int64_t timeout_us) DWORD ret; WaitForSingleObject(cond->event, 0); -#if MSC_VER <= 1310 - slock_unlock(lock); - ret = WaitForSingleObject(cond->event, (DWORD)(timeout_us) / 1000); -#else ret = SignalObjectAndWait(lock->lock, cond->event, (DWORD)(timeout_us) / 1000, FALSE); -#endif slock_lock(lock); return ret == WAIT_OBJECT_0;