From 64af7d5ae5af526e69ae1e62d049285c2fb63c80 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Wed, 1 Jun 2011 05:55:48 +0000 Subject: [PATCH] Eina : eina_inline_lock_win32.x : fix cedric's modifications in win32 code SVN revision: 59855 --- legacy/eina/src/include/eina_inline_lock_win32.x | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/legacy/eina/src/include/eina_inline_lock_win32.x b/legacy/eina/src/include/eina_inline_lock_win32.x index 6b96479..d495b6f 100644 --- a/legacy/eina/src/include/eina_inline_lock_win32.x +++ b/legacy/eina/src/include/eina_inline_lock_win32.x @@ -147,7 +147,7 @@ static inline Eina_Bool _eina_condition_internal_timedwait(Eina_Condition *cond, DWORD t) { #if _WIN32_WINNT >= 0x0600 - SleepConditionVariableCS(&cond->condition, cond->mutex, INFINITE); + SleepConditionVariableCS(&cond->condition, cond->mutex, t); #else DWORD ret; Eina_Bool last_waiter; @@ -201,21 +201,21 @@ _eina_condition_internal_timedwait(Eina_Condition *cond, DWORD t) if (ret == WAIT_FAILED) return EINA_FALSE; } +#endif return EINA_TRUE; -#endif } static inline Eina_Bool eina_condition_timedwait(Eina_Condition *cond, double val) { - _eina_condition_internal_timedwait(cond, val * 1000); + return _eina_condition_internal_timedwait(cond, (DWORD)(val * 1000)); } static inline Eina_Bool eina_condition_wait(Eina_Condition *cond) { - _eina_condition_internal_timedwait(cond, INFINITE); + return _eina_condition_internal_timedwait(cond, INFINITE); } static inline Eina_Bool @@ -223,6 +223,7 @@ eina_condition_broadcast(Eina_Condition *cond) { #if _WIN32_WINNT >= 0x0600 WakeAllConditionVariable(&cond->condition); + return EINA_TRUE; #else Eina_Bool have_waiters; -- 2.7.4