From 9e20be076648f8f9d34dc270654007ea070275cf Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Mon, 9 May 2011 13:12:36 +0000 Subject: [PATCH] eina: have same behaviour on windows and linux. SVN revision: 59297 --- legacy/eina/src/include/eina_inline_lock_win32.x | 6 ++++++ legacy/eina/src/include/eina_inline_lock_wince.x | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/legacy/eina/src/include/eina_inline_lock_win32.x b/legacy/eina/src/include/eina_inline_lock_win32.x index 752db90473..750dd3acbd 100644 --- a/legacy/eina/src/include/eina_inline_lock_win32.x +++ b/legacy/eina/src/include/eina_inline_lock_win32.x @@ -42,7 +42,9 @@ eina_lock_free(Eina_Lock *mutex) static inline Eina_Bool eina_lock_take(Eina_Lock *mutex) { +#ifdef EINA_HAVE_ON_OFF_THREADS if (!_eina_threads_activated) return EINA_FALSE; +#endif EnterCriticalSection(mutex); @@ -52,7 +54,9 @@ eina_lock_take(Eina_Lock *mutex) static inline Eina_Bool eina_lock_take_try(Eina_Lock *mutex) { +#ifdef EINA_HAVE_ON_OFF_THREADS if (!_eina_threads_activated) return EINA_FALSE; +#endif return TryEnterCriticalSection(mutex) == 0 ? EINA_FALSE : EINA_TRUE; } @@ -60,7 +64,9 @@ eina_lock_take_try(Eina_Lock *mutex) static inline Eina_Bool eina_lock_release(Eina_Lock *mutex) { +#ifdef EINA_HAVE_ON_OFF_THREADS if (!_eina_threads_activated) return EINA_FALSE; +#endif LeaveCriticalSection(mutex); diff --git a/legacy/eina/src/include/eina_inline_lock_wince.x b/legacy/eina/src/include/eina_inline_lock_wince.x index 57c9092547..53267af0a0 100644 --- a/legacy/eina/src/include/eina_inline_lock_wince.x +++ b/legacy/eina/src/include/eina_inline_lock_wince.x @@ -46,7 +46,9 @@ eina_lock_take(Eina_Lock *mutex) { DWORD res; +#ifdef EINA_HAVE_ON_OFF_THREADS if (!_eina_threads_activated) return EINA_FALSE; +#endif res = WaitForSingleObject(*mutex, INFINITE); if ((res == WAIT_ABANDONED) || (res == WAIT_FAILED)) @@ -64,7 +66,9 @@ eina_lock_take_try(Eina_Lock *mutex) static inline Eina_Bool eina_lock_release(Eina_Lock *mutex) { +#ifdef EINA_HAVE_ON_OFF_THREADS if (!_eina_threads_activated) return EINA_FALSE; +#endif return ReleaseMutex(*mutex); }