From 47ed564056a657eb602559576d59cd66734e7234 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sat, 22 Dec 2018 10:13:06 +0200 Subject: Properly fix building with HarfBuzz and without libotf HarfBuzz support does not depend on libotf, the build breakage when libotf is missing was because code guarded with: #if defined HAVE_M17N_FLT && defined HAVE_LIBOTF was incorrectly changed to: #if defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ this is now properly fixed by making it: #if (defined HAVE_M17N_FLT && defined HAVE_LIBOTF) || defined HAVE_HARFBUZZ Other changes in previous commits were reverted. --- src/xftfont.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/xftfont.c') diff --git a/src/xftfont.c b/src/xftfont.c index 5111936f3e7..56d0e30e24c 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_LIBOTF && (defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ) +#if (defined HAVE_M17N_FLT && defined HAVE_LIBOTF) || 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_LIBOTF && (defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ) +#if (defined HAVE_M17N_FLT && defined HAVE_LIBOTF) || defined HAVE_HARFBUZZ .shape = xftfont_shape, #endif #ifdef HAVE_OTF_GET_VARIATION_GLYPHS -- cgit v1.2.1