mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-25 05:52:42 -08:00
Code Issues Projects Releases Wiki Activity

Fix previous change. Define ftfont_variation_glyphs

Browse source 
even if HAVE_M17N_FLT is not defined.
This commit is contained in:
Kenichi Handa 2009-03-30 05:39:01 +00:00
parent fd7299fdfd
commit e386973195
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2009-03-30 Kenichi Handa <handa@m17n.org>
* ftfont.c: Fix previous change. Define ftfont_variation_glyphs
even if HAVE_M17N_FLT is not defined.
2009-03-29 Sebastian Rose <sebastian_rose@gmx.de> (tiny change)
* ftfont.c: Conditionalize prototyping and use of

9
src/ftfont.c
View file

@ -382,14 +382,10 @@ static int ftfont_anchor_point P_ ((struct font *, unsigned, int,
static Lisp_Object ftfont_otf_capability P_ ((struct font *));
static Lisp_Object ftfont_shape P_ ((Lisp_Object));
#ifdef HAVE_LIBOTF
#ifdef HAVE_M17N_FLT
#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
static int ftfont_variation_glyphs P_ ((struct font *, int c,
unsigned variations[256]));
#endif /* HAVE_OTF_GET_VARIATION_GLYPHS */
#endif /* HAVE_M17N_FLT */
#endif /* HAVE_LIBOTF */
struct font_driver ftfont_driver =
{
@ -430,7 +426,7 @@ struct font_driver ftfont_driver =
#endif /* not (HAVE_M17N_FLT && HAVE_LIBOTF) */
NULL, /* check */
#if defined (HAVE_LIBOTF) && defined (HAVE_M17N_FLT) && defined (HAVE_OTF_GET_VARIATION_GLYPHS)
#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
ftfont_variation_glyphs
#else
NULL
@ -2023,6 +2019,8 @@ ftfont_shape (lgstring)
return ftfont_shape_by_flt (lgstring, font, ftfont_info->ft_size->face, otf);
}
#endif /* HAVE_M17N_FLT */
#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
static int
@ -2040,7 +2038,6 @@ ftfont_variation_glyphs (font, c, variations)
}
#endif /* HAVE_OTF_GET_VARIATION_GLYPHS */
#endif /* HAVE_M17N_FLT */
#endif /* HAVE_LIBOTF */
Lisp_Object