From 1b5f9bc082a5c34fa6508db93964d4d6f241714e Mon Sep 17 00:00:00 2001 From: cedric Date: Mon, 9 May 2011 13:12:36 +0000 Subject: [PATCH] eina: have same behaviour on windows and linux. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@59297 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/include/eina_inline_lock_win32.x | 6 ++++++ src/include/eina_inline_lock_wince.x | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/include/eina_inline_lock_win32.x b/src/include/eina_inline_lock_win32.x index 752db90..750dd3a 100644 --- a/src/include/eina_inline_lock_win32.x +++ b/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/src/include/eina_inline_lock_wince.x b/src/include/eina_inline_lock_wince.x index 57c9092..53267af 100644 --- a/src/include/eina_inline_lock_wince.x +++ b/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); } -- 2.7.4