diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-03-29 17:12:26 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-03-29 17:12:26 +0000 |
| commit | 3ce80cbea34456ff1d570717075488b9edcb57c2 (patch) | |
| tree | fd5ebe6fefd76ca4bb6eff0deb42e994631014d8 | |
| parent | 5da5f80524b3936788df5af791352ea7bef20d20 (diff) | |
| download | emacs-3ce80cbea34456ff1d570717075488b9edcb57c2.tar.gz | |
Conditionalize prototyping and use of ftfont_variation_glyphs.
| -rw-r--r-- | src/ftfont.c | 10 |
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, 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 |