aboutsummaryrefslogtreecommitdiffstats
path: root/src/ftfont.c
diff options
context:
space:
mode:
authorEli Zaretskii2018-12-17 19:01:43 +0200
committerEli Zaretskii2018-12-17 19:01:43 +0200
commitcae8b69addd22dee5eff86d79bee1bb452d827fb (patch)
tree0c9259358e806eff3508d8bd4f9e64cbfa535cf9 /src/ftfont.c
parent051d65a5a028fe31a735f2a50174d6078f830aa9 (diff)
downloademacs-cae8b69addd22dee5eff86d79bee1bb452d827fb.tar.gz
emacs-cae8b69addd22dee5eff86d79bee1bb452d827fb.zip
Fix compilation errors when building without libotf
* 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)
Diffstat (limited to 'src/ftfont.c')
-rw-r--r--src/ftfont.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ftfont.c b/src/ftfont.c
index bc988963937..bbdc936ffd1 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -2931,7 +2931,7 @@ done:
2931 2931
2932#endif /* HAVE_HARFBUZZ */ 2932#endif /* HAVE_HARFBUZZ */
2933 2933
2934#if defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ 2934#if defined HAVE_LIBOTF && (defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ)
2935 2935
2936Lisp_Object 2936Lisp_Object
2937ftfont_shape (Lisp_Object lgstring) 2937ftfont_shape (Lisp_Object lgstring)
@@ -2956,7 +2956,7 @@ ftfont_shape (Lisp_Object lgstring)
2956 } 2956 }
2957} 2957}
2958 2958
2959#endif /* defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ */ 2959#endif /* HAVE_LIBOTF && (HAVE_M17N_FLT || defined HAVE_HARFBUZZ) */
2960 2960
2961static const char *const ftfont_booleans [] = { 2961static const char *const ftfont_booleans [] = {
2962 ":antialias", 2962 ":antialias",
@@ -3037,7 +3037,7 @@ static struct font_driver const ftfont_driver =
3037#ifdef HAVE_LIBOTF 3037#ifdef HAVE_LIBOTF
3038 .otf_capability = ftfont_otf_capability, 3038 .otf_capability = ftfont_otf_capability,
3039#endif 3039#endif
3040#if defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ 3040#if defined HAVE_LIBOTF && (defined HAVE_M17N_FLT || defined HAVE_HARFBUZZ)
3041 .shape = ftfont_shape, 3041 .shape = ftfont_shape,
3042#endif 3042#endif
3043#ifdef HAVE_OTF_GET_VARIATION_GLYPHS 3043#ifdef HAVE_OTF_GET_VARIATION_GLYPHS