mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-08 16:52:40 -08:00
Code Issues Projects Releases Wiki Activity

Fix compilation errors when building without libotf

Browse source 
* src/ftfont.c (ftfont_shape): Only compile if HAVE_LIBOTF is
defined.
(ftfont_driver): Set the .shape member only if HAVE_LIBOTF is
defined.  (Bug#33771)
This commit is contained in:
Eli Zaretskii 2018-12-17 19:01:43 +02:00
parent 051d65a5a0
commit cae8b69add
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/ftfont.c
View file

@ -2931,7 +2931,7 @@ done:
#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