From 3479d5e0eaae168408195030fb35f2a79c6289b1 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Tue, 20 Jul 2010 12:10:40 +0000 Subject: [PATCH] * evas: fix fribidi lock. SVN revision: 50380 --- legacy/evas/src/lib/engines/common/evas_intl_utils.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/legacy/evas/src/lib/engines/common/evas_intl_utils.c b/legacy/evas/src/lib/engines/common/evas_intl_utils.c index a122d9bca3..fa74f52833 100644 --- a/legacy/evas/src/lib/engines/common/evas_intl_utils.c +++ b/legacy/evas/src/lib/engines/common/evas_intl_utils.c @@ -11,10 +11,6 @@ #define UTF8_BYTES_PER_CHAR 4 -#ifdef BUILD_PTHREAD -static LK(fribidi_lock); -#endif - /* FIXME: fribidi_utf8_to_unicode should use char len and not byte len!*/ char * evas_intl_utf8_to_visual(const char *text, @@ -80,15 +76,15 @@ evas_intl_utf8_to_visual(const char *text, tmp_V_to_L_list = *position_V_to_L_list; } - LKL(fribidi_lock); + FBDLOCK(); if (!fribidi_log2vis(unicode_in, len, direction, unicode_out, tmp_L_to_V_list, tmp_V_to_L_list, tmp_level_list)) { - LKU(fribidi_lock); + FBDUNLOCK(); len = -2; goto error2; } - LKU(fribidi_lock); + FBDUNLOCK(); text_out = malloc(UTF8_BYTES_PER_CHAR * len + 1); if (!text_out) @@ -97,6 +93,7 @@ evas_intl_utf8_to_visual(const char *text, goto error2; } + FBDLOCK(); fribidi_unicode_to_utf8(unicode_out, len, text_out); FBDUNLOCK();