diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-06-02 13:30:21 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2019-06-02 13:30:21 +0900 |
| commit | 2ae0c7a434dcdcc53e2ccfc758093714b0695c3b (patch) | |
| tree | b0a4ee4d142be9b3c171f933c43233ae303d6c0f /src/ftcrfont.c | |
| parent | 1ab69630dcb8c7a1b1b4171211a7c8ebf11b0d1c (diff) | |
| download | emacs-2ae0c7a434dcdcc53e2ccfc758093714b0695c3b.tar.gz | |
Revert previous commit
This reverts commit 1ab69630dcb8c7a1b1b4171211a7c8ebf11b0d1c.
It has a wrong commit message.
Diffstat (limited to 'src/ftcrfont.c')
| -rw-r--r-- | src/ftcrfont.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ftcrfont.c b/src/ftcrfont.c index 1c28a7ceb67..0c3b74ff289 100644 --- a/src/ftcrfont.c +++ b/src/ftcrfont.c @@ -455,7 +455,7 @@ ftcrfont_shape (Lisp_Object lgstring, Lisp_Object direction) } #endif -#if defined HAVE_OTF_GET_VARIATION_GLYPHS || defined HAVE_FT_FACE_GETCHARVARIANTINDEX +#ifdef HAVE_OTF_GET_VARIATION_GLYPHS static int ftcrfont_variation_glyphs (struct font *font, int c, unsigned variations[256]) { @@ -470,7 +470,7 @@ ftcrfont_variation_glyphs (struct font *font, int c, unsigned variations[256]) return result; } -#endif /* HAVE_OTF_GET_VARIATION_GLYPHS || HAVE_FT_FACE_GETCHARVARIANTINDEX */ +#endif /* HAVE_OTF_GET_VARIATION_GLYPHS */ static int ftcrfont_draw (struct glyph_string *s, @@ -583,7 +583,7 @@ struct font_driver const ftcrfont_driver = #if defined HAVE_M17N_FLT && defined HAVE_LIBOTF .shape = ftcrfont_shape, #endif -#if defined HAVE_OTF_GET_VARIATION_GLYPHS || defined HAVE_FT_FACE_GETCHARVARIANTINDEX +#ifdef HAVE_OTF_GET_VARIATION_GLYPHS .get_variation_glyphs = ftcrfont_variation_glyphs, #endif .filter_properties = ftfont_filter_properties, |