summaryrefslogtreecommitdiff
path: root/src/xsettings.c
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2022-10-29 08:38:09 +0800
committerPo Lu <luangruo@yahoo.com>2022-10-29 08:38:43 +0800
commit8562a23fc6a382367351a1471d8585279d12605a (patch)
tree4a81f1efa1c62727ce8d15211e694030273bc817 /src/xsettings.c
parent71589b101ccbec67fa2741856ee0add5752dea72 (diff)
downloademacs-8562a23fc6a382367351a1471d8585279d12605a.tar.gz
Include Cairo FreeType header when available
* src/xsettings.c: Include cairo-ft.h if CAIRO_HAS_FT_FONT. (bug#58830)
Diffstat (limited to 'src/xsettings.c')
-rw-r--r--src/xsettings.c7
1 files changed, 4 insertions, 3 deletions
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;