Re: master 52d4c98cec: Fix detection of DPI changes in builds without Xft

[Vincent Bernat]

On 2022-10-28 22:35, Stefan Kangas wrote:

> > branch: master
> > commit 52d4c98cec0901ef5cc1c55d5b3b33ac9d9c519f
> > Author: Vincent Bernat <bernat@luffy.cx>
> > Commit: Eli Zaretskii <eliz@gnu.org>
> >
> >      Fix detection of DPI changes in builds without Xft
> >
> >      * src/xsettings.c (apply_xft_settings) [!HAVE_XFT]: Support
> >      XSETTINGS changes in non-XFT builds.  (Bug#43128)
>
> This seems to lead to this warning:
>
> xsettings.c: In function ‘apply_xft_settings’:
> xsettings.c:827:3: warning: implicit declaration of function
> ‘cairo_ft_font_options_substitute’; did you mean
> ‘cairo_font_options_status’? [-Wimplicit-function-declaration]
>    827 |   cairo_ft_font_options_substitute (options, pat);
>        |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>        |   cairo_font_options_status
> xsettings.c:827:3: warning: nested extern declaration of
> ‘cairo_ft_font_options_substitute’ [-Wnested-externs]

It is defined in cairo-ft.h. The declaration needs to be updated:

#if defined USE_CAIRO || defined HAVE_XFT
#ifdef USE_CAIRO
#include <fontconfig/fontconfig.h>
#include <cairo-ft.h>
#else  /* HAVE_XFT */
#include <X11/Xft/Xft.h>
#endif
#endif