diff --git a/src/ftcrfont.c b/src/ftcrfont.c index 6d74d937a7..ae5b0a92ee 100644 --- a/src/ftcrfont.c +++ b/src/ftcrfont.c @@ -302,7 +302,7 @@ struct font_driver const ftcrfont_driver = #ifdef HAVE_LIBOTF .otf_capability = ftfont_otf_capability, #endif -#if defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ +#if defined HAVE_LIBOTF && (defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ) .shape = ftfont_shape, #endif #ifdef HAVE_OTF_GET_VARIATION_GLYPHS diff --git a/src/ftfont.c b/src/ftfont.c index bc98896393..bbdc936ffd 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -2931,7 +2931,7 @@ ftfont_shape_by_hb (Lisp_Object lgstring, FT_Face ft_face, hb_font_t *hb_font, #endif /* HAVE_HARFBUZZ */ -#if defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ +#if defined HAVE_LIBOTF && (defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ) Lisp_Object ftfont_shape (Lisp_Object lgstring) @@ -2956,7 +2956,7 @@ ftfont_shape (Lisp_Object lgstring) } } -#endif /* defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ */ +#endif /* HAVE_LIBOTF && (HAVE_M17N_FLT || defined HAVE_HARFBUZZ) */ static const char *const ftfont_booleans [] = { ":antialias", @@ -3037,7 +3037,7 @@ static struct font_driver const ftfont_driver = #ifdef HAVE_LIBOTF .otf_capability = ftfont_otf_capability, #endif -#if defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ +#if defined HAVE_LIBOTF && (defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ) .shape = ftfont_shape, #endif #ifdef HAVE_OTF_GET_VARIATION_GLYPHS diff --git a/src/ftxfont.c b/src/ftxfont.c index 4d4ff6ee0c..a30b07636e 100644 --- a/src/ftxfont.c +++ b/src/ftxfont.c @@ -359,7 +359,7 @@ struct font_driver const ftxfont_driver = .otf_capability = ftfont_otf_capability, #endif .end_for_frame = ftxfont_end_for_frame, -#if defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ +#if defined HAVE_LIBOTF && (defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ) .shape = ftfont_shape, #endif #ifdef HAVE_OTF_GET_VARIATION_GLYPHS diff --git a/src/xftfont.c b/src/xftfont.c index e0bd243467..5111936f3e 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -672,7 +672,7 @@ xftfont_draw (struct glyph_string *s, int from, int to, int x, int y, return len; } -#if defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ +#if defined HAVE_LIBOTF && (defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ) static Lisp_Object xftfont_shape (Lisp_Object lgstring) { @@ -784,7 +784,7 @@ struct font_driver const xftfont_driver = .otf_capability = ftfont_otf_capability, #endif .end_for_frame = xftfont_end_for_frame, -#if defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ +#if defined HAVE_LIBOTF && (defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ) .shape = xftfont_shape, #endif #ifdef HAVE_OTF_GET_VARIATION_GLYPHS