From 3ce80cbea34456ff1d570717075488b9edcb57c2 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sun, 29 Mar 2009 17:12:26 +0000 Subject: [PATCH] Conditionalize prototyping and use of ftfont_variation_glyphs. --- src/ftfont.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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, int *, 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 = { @@ -422,7 +429,8 @@ struct font_driver ftfont_driver = NULL, #endif /* not (HAVE_M17N_FLT && HAVE_LIBOTF) */ NULL, /* check */ -#ifdef HAVE_OTF_GET_VARIATION_GLYPHS + +#if defined (HAVE_LIBOTF) && defined (HAVE_M17N_FLT) && defined (HAVE_OTF_GET_VARIATION_GLYPHS) ftfont_variation_glyphs #else NULL -- 2.39.5