diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2018-12-22 10:13:06 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2018-12-22 10:22:22 +0200 |
| commit | 47ed564056a657eb602559576d59cd66734e7234 (patch) | |
| tree | 1f1fb78e0f23c53da91d48c27d2ff653d895f77f /src/xftfont.c | |
| parent | 80e0491420a9f645efa6c1438f209f70610c4065 (diff) | |
| download | emacs-47ed564056a657eb602559576d59cd66734e7234.tar.gz | |
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.
Diffstat (limited to 'src/xftfont.c')
| -rw-r--r-- | src/xftfont.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 |