bug#46509: 28.0.50; Unused static function in xfns.c with GTK2

[Basil L. Contovounesios]

martin rudalics <rudalics@gmx.at> writes:

>>> Its definition is conditional on !USE_GTK || !HAVE_GTK3, but its use
>>> only on !USE_GTK.  Which one is right?
>>
>> The !USE_GTK one, I think.
>
> It's a tad more complicated.  You have to do something like the below.
>
> martin
>
> diff --git a/src/xfns.c b/src/xfns.c
> index 481ee0e225..82424ae080 100644
> --- a/src/xfns.c
> +++ b/src/xfns.c
> @@ -4663,6 +4663,9 @@ x_get_net_workarea (struct x_display_info *dpyinfo, 
> XRectangle *rect)
>    return result;
>  }
>
> +#endif /* !defined USE_GTK || !defined HAVE_GTK3 */
> +#if !defined USE_GTK
> +
>  /* Return monitor number where F is "most" or closest to.  */
>  static int
>  x_get_monitor_for_frame (struct frame *f,

What about this?

>From a1761d8afff8b9fd7143fd8e311c6572e1639fbc Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <contovob@tcd.ie>
Date: Sun, 14 Feb 2021 16:58:06 +0000
Subject: [PATCH] Fix unused function warning in xfns.c with GTK2

* src/xfns.c (x_get_net_workarea): Define only when using GTK other
than GTK3, to match its use in Fx_display_monitor_attributes_list.
(x_get_monitor_for_frame, x_make_monitor_attribute_list)
(x_get_monitor_attributes_fallback, x_get_monitor_attributes_xrandr)
(x_get_monitor_attributes_xinerama, x_get_monitor_attributes):
Condition definitions on !USE_GTK, to match their use in
Fx_display_monitor_attributes_list (bug#46509).
(x_get_monitor_attributes_xrandr): Undefine RANDR13_LIBRARY after
it's been used.
---
 src/xfns.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/xfns.c b/src/xfns.c
index 481ee0e225..f572982ca1 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4599,7 +4599,7 @@ DEFUN ("x-display-save-under", Fx_display_save_under,
     return Qnil;
 }
 
-#if !defined USE_GTK || !defined HAVE_GTK3
+#if defined USE_GTK && !defined HAVE_GTK3
 
 /* Store the geometry of the workarea on display DPYINFO into *RECT.
    Return false if and only if the workarea information cannot be
@@ -4662,6 +4662,9 @@ x_get_net_workarea (struct x_display_info *dpyinfo, 
XRectangle *rect)
 
   return result;
 }
+#endif /* USE_GTK && !HAVE_GTK3 */
+
+#ifndef USE_GTK
 
 /* Return monitor number where F is "most" or closest to.  */
 static int
@@ -4877,6 +4880,8 @@ #define RANDR13_LIBRARY \
     pxid = XRRGetOutputPrimary (dpy, dpyinfo->root_window);
 #endif
 
+#undef RANDR13_LIBRARY
+
   for (i = 0; i < n_monitors; ++i)
     {
       XRROutputInfo *info = XRRGetOutputInfo (dpy, resources,
-- 
2.30.0

Thanks,

-- 
Basil