now that header was a mess - and this wasnt using the same lock! bad

bad!

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@49345 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/engines/common/evas_font_main.c b/src/lib/engines/common/evas_font_main.c
index d1aa51e..9068849 100644 (file)
--- a/src/lib/engines/common/evas_font_main.c
+++ b/src/lib/engines/common/evas_font_main.c
@@ -7,6 +7,9 @@
 FT_Library      evas_ft_lib = 0;
 static int      initialised = 0;
 
+LK(lock_font_draw); // for freetype2 API calls
+LK(lock_fribidi); // for fribidi API calls
+
 EAPI void
 evas_common_font_init(void)
 {
@@ -20,6 +23,8 @@ evas_common_font_init(void)
 #ifdef EVAS_FRAME_QUEUING
    evas_common_font_draw_init();
 #endif
+   LKI(lock_font_draw);
+   LKI(lock_fribidi);
 }
 
 EAPI void

diff --git a/src/lib/engines/common/evas_font_private.h b/src/lib/engines/common/evas_font_private.h
index 12ab17b..31bdaed 100644 (file)
--- a/src/lib/engines/common/evas_font_private.h
+++ b/src/lib/engines/common/evas_font_private.h
@@ -1,81 +1,23 @@
 #ifndef _EVAS_FONT_PRIVATE_H
-#define _EVAS_FONT_PRIVATE_H
+# define _EVAS_FONT_PRIVATE_H
 
-LK(lock_font_draw);    // for freetype2 API calls
-LK(lock_fribidi);              // for fribidi API calls
-
-#ifdef EVAS_FRAME_QUEUING
-#define FTLOCK() LKL(lock_font_draw)
-#define FTUNLOCK() LKU(lock_font_draw)
-
-#define FBDLOCK() LKL(lock_fribidi)
-#define FBDUNLOCK() LKU(lock_fribidi)
-#else
-#define FTLOCK(x) 
-#define FTUNLOCK(x) 
-
-#define FBDLOCK() 
-#define FBDUNLOCK() 
-#endif
-
-#endif /* !_EVAS_FONT_PRIVATE_H */
-
-#ifndef _EVAS_FONT_PRIVATE_H
-#define _EVAS_FONT_PRIVATE_H
-
-LK(lock_font_draw);    // for freetype2 API calls
-LK(lock_fribidi);              // for fribidi API calls
-
-#ifdef EVAS_FRAME_QUEUING
-#define FTLOCK() LKL(lock_font_draw)
-#define FTUNLOCK() LKU(lock_font_draw)
-
-#define FBDLOCK() LKL(lock_fribidi)
-#define FBDUNLOCK() LKU(lock_fribidi)
-#else
-#define FTLOCK(x) 
-#define FTUNLOCK(x) 
-
-#define FBDLOCK() 
-#define FBDUNLOCK() 
-#endif
-
-#endif /* !_EVAS_FONT_PRIVATE_H */
-
-#ifndef _EVAS_FONT_PRIVATE_H
-#define _EVAS_FONT_PRIVATE_H
-
-LK(lock_font_draw);    // for freetype2 API calls
-LK(lock_fribidi);              // for fribidi API calls
-
-#ifdef EVAS_FRAME_QUEUING
-#define FTLOCK() LKL(lock_font_draw)
-#define FTUNLOCK() LKU(lock_font_draw)
-
-#define FBDLOCK() LKL(lock_fribidi)
-#define FBDUNLOCK() LKU(lock_fribidi)
-#else
-#define FTLOCK(x) 
-#define FTUNLOCK(x) 
-
-#define FBDLOCK() 
-#define FBDUNLOCK() 
+#ifdef BUILD_PTHREAD
+extern LK(lock_font_draw); // for freetype2 API calls
+extern LK(lock_fribidi); // for fribidi API calls
 #endif
 
-#endif /* !_EVAS_FONT_PRIVATE_H */
-
-#ifndef _EVAS_FONT_PRIVATE_H
-#define _EVAS_FONT_PRIVATE_H
+# ifdef EVAS_FRAME_QUEUING
+#  define FTLOCK() LKL(lock_font_draw)
+#  define FTUNLOCK() LKU(lock_font_draw)
 
-LK(lock_font_draw);
+#  define FBDLOCK() LKL(lock_fribidi)
+#  define FBDUNLOCK() LKU(lock_fribidi)
+# else
+#  define FTLOCK(x) 
+#  define FTUNLOCK(x) 
 
-#ifdef EVAS_FRAME_QUEUING
-#define FTLOCK() LKL(lock_font_draw)
-#define FTUNLOCK() LKU(lock_font_draw)
-#else
-#define FTLOCK(x) 
-#define FTUNLOCK(x) 
-#endif
+#  define FBDLOCK() 
+#  define FBDUNLOCK() 
+# endif
 
 #endif /* !_EVAS_FONT_PRIVATE_H */
-