emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] harfbuzz 80e0491: Fix one last compilation warning in ftfo


From: Eli Zaretskii
Subject: [Emacs-diffs] harfbuzz 80e0491: Fix one last compilation warning in ftfont.c
Date: Tue, 18 Dec 2018 13:46:20 -0500 (EST)

branch: harfbuzz
commit 80e0491420a9f645efa6c1438f209f70610c4065
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix one last compilation warning in ftfont.c
    
    * src/ftfont.c (ftfont_get_hb_font): Only define 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 4e147cd..8476a74 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]