aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-03-29 17:12:26 +0000
committerChong Yidong2009-03-29 17:12:26 +0000
commit3ce80cbea34456ff1d570717075488b9edcb57c2 (patch)
treefd5ebe6fefd76ca4bb6eff0deb42e994631014d8
parent5da5f80524b3936788df5af791352ea7bef20d20 (diff)
downloademacs-3ce80cbea34456ff1d570717075488b9edcb57c2.tar.gz
emacs-3ce80cbea34456ff1d570717075488b9edcb57c2.zip
Conditionalize prototyping and use of ftfont_variation_glyphs.
-rw-r--r--src/ftfont.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/ftfont.c b/src/ftfont.c
index b8c39cd920d..33fb9b455a6 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -381,8 +381,15 @@ static int ftfont_anchor_point P_ ((struct font *, unsigned, int,
381 int *, int *)); 381 int *, int *));
382static Lisp_Object ftfont_otf_capability P_ ((struct font *)); 382static Lisp_Object ftfont_otf_capability P_ ((struct font *));
383static Lisp_Object ftfont_shape P_ ((Lisp_Object)); 383static Lisp_Object ftfont_shape P_ ((Lisp_Object));
384
385#ifdef HAVE_LIBOTF
386#ifdef HAVE_M17N_FLT
387#ifdef HAVE_OTF_GET_VARIATION_GLYPHS
384static int ftfont_variation_glyphs P_ ((struct font *, int c, 388static int ftfont_variation_glyphs P_ ((struct font *, int c,
385 unsigned variations[256])); 389 unsigned variations[256]));
390#endif /* HAVE_OTF_GET_VARIATION_GLYPHS */
391#endif /* HAVE_M17N_FLT */
392#endif /* HAVE_LIBOTF */
386 393
387struct font_driver ftfont_driver = 394struct font_driver ftfont_driver =
388 { 395 {
@@ -422,7 +429,8 @@ struct font_driver ftfont_driver =
422 NULL, 429 NULL,
423#endif /* not (HAVE_M17N_FLT && HAVE_LIBOTF) */ 430#endif /* not (HAVE_M17N_FLT && HAVE_LIBOTF) */
424 NULL, /* check */ 431 NULL, /* check */
425#ifdef HAVE_OTF_GET_VARIATION_GLYPHS 432
433#if defined (HAVE_LIBOTF) && defined (HAVE_M17N_FLT) && defined (HAVE_OTF_GET_VARIATION_GLYPHS)
426 ftfont_variation_glyphs 434 ftfont_variation_glyphs
427#else 435#else
428 NULL 436 NULL