From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 18 Dec 2018 15:02:52 +0000 (+0200)
Subject: Condition some more hb_* functions on HAVE_LIBOTF.
X-Git-Tag: emacs-27.0.90~2671^2~42
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=681271d946c16d90409e00cec4216656c771f1d6;p=emacs.git

Condition some more hb_* functions on HAVE_LIBOTF.
---

diff --git a/src/ftfont.c b/src/ftfont.c
index 824a005df1b..4e147cd277b 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -2670,7 +2670,7 @@ ftfont_variation_glyphs (struct font *font, int c, unsigned variations[256])
 #endif	/* HAVE_LIBOTF */
 
 #ifdef HAVE_HARFBUZZ
-
+#ifdef HAVE_LIBOTF
 static hb_unicode_combining_class_t
 uni_combining (hb_unicode_funcs_t *funcs, hb_codepoint_t ch, void *user_data)
 {
@@ -2815,7 +2815,6 @@ get_hb_unicode_funcs (void)
   return funcs;
 }
 
-#ifdef HAVE_LIBOTF
 static Lisp_Object
 ftfont_shape_by_hb (Lisp_Object lgstring, FT_Face ft_face, hb_font_t *hb_font,
                     FT_Matrix *matrix)