evas: \o/ My mojo is back, unbork pipeline font rendering.

SVN revision: 70687

diff --git a/legacy/evas/src/lib/engines/common/evas_font_private.h b/legacy/evas/src/lib/engines/common/evas_font_private.h
index e00bd9b..2a2a382 100644 (file)
--- a/legacy/evas/src/lib/engines/common/evas_font_private.h
+++ b/legacy/evas/src/lib/engines/common/evas_font_private.h
@@ -6,10 +6,18 @@
 extern LK(lock_font_draw); // for freetype2 API calls
 extern LK(lock_bidi); // for fribidi API calls
 extern LK(lock_ot); // for harfbuzz calls
-#endif
+#  define FTLOCK()   LKL(lock_font_draw)
+#  define FTUNLOCK() LKU(lock_font_draw)
+
+#  define BIDILOCK()   LKL(lock_bidi)
+#  define BIDIUNLOCK() LKU(lock_bidi)
 
-#  define FTLOCK(x)
-#  define FTUNLOCK(x)
+/* Macros for text walking */
+#  define OTLOCK()   LKL(lock_ot)
+#  define OTUNLOCK() LKU(lock_ot)
+#else
+#  define FTLOCK()
+#  define FTUNLOCK()
 
 #  define BIDILOCK()
 #  define BIDIUNLOCK()
@@ -17,6 +25,7 @@ extern LK(lock_ot); // for harfbuzz calls
 /* Macros for text walking */
 #  define OTLOCK()
 #  define OTUNLOCK()
+#endif
 
 void evas_common_font_source_unload(RGBA_Font_Source *fs);
 void evas_common_font_source_reload(RGBA_Font_Source *fs);