[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] harfbuzz cae8b69: Fix compilation errors when building wit
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] harfbuzz cae8b69: Fix compilation errors when building without libotf |
Date: |
Mon, 17 Dec 2018 12:02:26 -0500 (EST) |
branch: harfbuzz
commit cae8b69addd22dee5eff86d79bee1bb452d827fb
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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)
---
src/ftfont.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/ftfont.c b/src/ftfont.c
index bc98896..bbdc936 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] harfbuzz cae8b69: Fix compilation errors when building without libotf,
Eli Zaretskii <=