master 8562a23fc6 1/4: Include Cairo FreeType header when available

[Po Lu]

branch: master
commit 8562a23fc6a382367351a1471d8585279d12605a
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Include Cairo FreeType header when available
    
    * src/xsettings.c: Include cairo-ft.h if CAIRO_HAS_FT_FONT.
    (bug#58830)
---
 src/xsettings.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/xsettings.c b/src/xsettings.c
index c4c70ad846..15e7ff5499 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;