From: Po Lu <luangruo@yahoo.com>
Date: Sat, 29 Oct 2022 00:38:09 +0000 (+0800)
Subject: Include Cairo FreeType header when available
X-Git-Tag: emacs-29.0.90~1616^2~405
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8562a23fc6a382367351a1471d8585279d12605a;p=emacs.git

Include Cairo FreeType header when available

* src/xsettings.c: Include cairo-ft.h if CAIRO_HAS_FT_FONT.
(bug#58830)
---

diff --git a/src/xsettings.c b/src/xsettings.c
index c4c70ad8460..15e7ff54995 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -54,13 +54,14 @@ typedef unsigned int CARD32;
 #include <gconf/gconf-client.h>
 #endif
 
-#if defined USE_CAIRO || defined HAVE_XFT
 #ifdef USE_CAIRO
 #include <fontconfig/fontconfig.h>
-#include <cairo-ft.h>
-#else  /* HAVE_XFT */
+#elif defined HAVE_XFT
 #include <X11/Xft/Xft.h>
 #endif
+
+#if defined USE_CAIRO && defined CAIRO_HAS_FT_FONT
+#include <cairo/cairo-ft.h>
 #endif
 
 static char *current_mono_font;