forked from enlightenment/efl
now that header was a mess - and this wasnt using the same lock! bad
bad! SVN revision: 49345
This commit is contained in:
parent
f1e19253e6
commit
77123462e1
|
@ -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
|
||||
|
|
|
@ -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()
|
||||
#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 */
|
||||
# ifdef EVAS_FRAME_QUEUING
|
||||
# define FTLOCK() LKL(lock_font_draw)
|
||||
# define FTUNLOCK() LKU(lock_font_draw)
|
||||
|
||||
#ifndef _EVAS_FONT_PRIVATE_H
|
||||
#define _EVAS_FONT_PRIVATE_H
|
||||
# define FBDLOCK() LKL(lock_fribidi)
|
||||
# define FBDUNLOCK() LKU(lock_fribidi)
|
||||
# else
|
||||
# define FTLOCK(x)
|
||||
# define FTUNLOCK(x)
|
||||
|
||||
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
|
||||
# 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);
|
||||
|
||||
#ifdef EVAS_FRAME_QUEUING
|
||||
#define FTLOCK() LKL(lock_font_draw)
|
||||
#define FTUNLOCK() LKU(lock_font_draw)
|
||||
#else
|
||||
#define FTLOCK(x)
|
||||
#define FTUNLOCK(x)
|
||||
#endif
|
||||
|
||||
#endif /* !_EVAS_FONT_PRIVATE_H */
|
||||
|
||||
|
|
Loading…
Reference in New Issue