summaryrefslogtreecommitdiff
path: root/src/lib/ecore
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-12-06 03:02:47 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-12-06 03:02:47 +0000
commit1a3bb9f0095f69701373e39ee3a39dce90aa6bf5 (patch)
tree5a911c3baa5178c3a7f5989a23da87272fe0a8d0 /src/lib/ecore
parent2def8f1f1eb5b8d38cd887a1f488e7a499d549b4 (diff)
efl: revert r80290 as it bork the world.
SVN revision: 80296
Diffstat (limited to 'src/lib/ecore')
-rw-r--r--src/lib/ecore/ecore_private.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index 7e7ff3a16e..f0add822fe 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -246,7 +246,12 @@ extern Eina_Lock _ecore_main_loop_lock;
246static inline void 246static inline void
247_ecore_lock(void) 247_ecore_lock(void)
248{ 248{
249#ifdef HAVE_THREAD_SAFETY
249 eina_lock_take(&_ecore_main_loop_lock); 250 eina_lock_take(&_ecore_main_loop_lock);
251#else
252 /* at least check we're not being called from a thread */
253 EINA_MAIN_LOOP_CHECK_RETURN;
254#endif
250 _ecore_main_lock_count++; 255 _ecore_main_lock_count++;
251 /* assert(_ecore_main_lock_count == 1); */ 256 /* assert(_ecore_main_lock_count == 1); */
252} 257}
@@ -256,7 +261,9 @@ _ecore_unlock(void)
256{ 261{
257 _ecore_main_lock_count--; 262 _ecore_main_lock_count--;
258 /* assert(_ecore_main_lock_count == 0); */ 263 /* assert(_ecore_main_lock_count == 0); */
264#ifdef HAVE_THREAD_SAFETY
259 eina_lock_release(&_ecore_main_loop_lock); 265 eina_lock_release(&_ecore_main_loop_lock);
266#endif
260} 267}
261 268
262/* 269/*