diff options
| author | Eli Zaretskii | 2018-12-18 17:02:52 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2018-12-18 17:02:52 +0200 |
| commit | 681271d946c16d90409e00cec4216656c771f1d6 (patch) | |
| tree | a6f5b157390fe763e1d7afa08de4e6e825193b0c /src | |
| parent | 8ea9fbe34bce795450e0f4200078649dcf1d3f8c (diff) | |
| download | emacs-681271d946c16d90409e00cec4216656c771f1d6.tar.gz emacs-681271d946c16d90409e00cec4216656c771f1d6.zip | |
Condition some more hb_* functions on HAVE_LIBOTF.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ftfont.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index 824a005df1b..4e147cd277b 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -2670,7 +2670,7 @@ ftfont_variation_glyphs (struct font *font, int c, unsigned variations[256]) | |||
| 2670 | #endif /* HAVE_LIBOTF */ | 2670 | #endif /* HAVE_LIBOTF */ |
| 2671 | 2671 | ||
| 2672 | #ifdef HAVE_HARFBUZZ | 2672 | #ifdef HAVE_HARFBUZZ |
| 2673 | 2673 | #ifdef HAVE_LIBOTF | |
| 2674 | static hb_unicode_combining_class_t | 2674 | static hb_unicode_combining_class_t |
| 2675 | uni_combining (hb_unicode_funcs_t *funcs, hb_codepoint_t ch, void *user_data) | 2675 | uni_combining (hb_unicode_funcs_t *funcs, hb_codepoint_t ch, void *user_data) |
| 2676 | { | 2676 | { |
| @@ -2815,7 +2815,6 @@ get_hb_unicode_funcs (void) | |||
| 2815 | return funcs; | 2815 | return funcs; |
| 2816 | } | 2816 | } |
| 2817 | 2817 | ||
| 2818 | #ifdef HAVE_LIBOTF | ||
| 2819 | static Lisp_Object | 2818 | static Lisp_Object |
| 2820 | ftfont_shape_by_hb (Lisp_Object lgstring, FT_Face ft_face, hb_font_t *hb_font, | 2819 | ftfont_shape_by_hb (Lisp_Object lgstring, FT_Face ft_face, hb_font_t *hb_font, |
| 2821 | FT_Matrix *matrix) | 2820 | FT_Matrix *matrix) |