From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 18 Dec 2018 18:45:27 +0000 (+0200)
Subject: Fix one last compilation warning in ftfont.c
X-Git-Tag: emacs-27.0.90~2671^2~41
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=80e0491420a9f645efa6c1438f209f70610c4065;p=emacs.git

Fix one last compilation warning in ftfont.c

* src/ftfont.c (ftfont_get_hb_font): Only define if
HAVE_LIBOTF is defined.  (Bug#33771)
---

diff --git a/src/ftfont.c b/src/ftfont.c
index 4e147cd277b..8476a74854c 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -474,9 +474,8 @@ ftfont_get_otf (struct ftfont_info *ftfont_info)
   ftfont_info->otf = otf;
   return otf;
 }
-#endif	/* HAVE_LIBOTF */
 
-#ifdef HAVE_HARFBUZZ
+# ifdef HAVE_HARFBUZZ
 
 static hb_font_t *
 ftfont_get_hb_font (struct ftfont_info *ftfont_info)
@@ -487,7 +486,8 @@ ftfont_get_hb_font (struct ftfont_info *ftfont_info)
   return ftfont_info->hb_font;
 }
 
-#endif	/* HAVE_HARFBUZZ */
+# endif	/* HAVE_HARFBUZZ */
+#endif	/* HAVE_LIBOTF */
 
 Lisp_Object
 ftfont_get_cache (struct frame *f)