]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix one last compilation warning in ftfont.c
authorEli Zaretskii <eliz@gnu.org>
Tue, 18 Dec 2018 18:45:27 +0000 (20:45 +0200)
committerEli Zaretskii <eliz@gnu.org>
Tue, 18 Dec 2018 18:45:27 +0000 (20:45 +0200)
* src/ftfont.c (ftfont_get_hb_font): Only define if
HAVE_LIBOTF is defined.  (Bug#33771)

src/ftfont.c

index 4e147cd277b36515cb581b18ad2a8ee9aa0bc221..8476a74854c7e74be58cd0902e4a9eafb91e15e1 100644 (file)
@@ -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)