From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 14 Jul 2022 13:37:44 +0000 (+0300)
Subject: ; Fix compilation warnings in a build --without-all
X-Git-Tag: emacs-29.0.90~1447^2~941
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c02986e4c3c46aee6bf6ad4c0e9acd7ba9f906df;p=emacs.git

; Fix compilation warnings in a build --without-all

* src/xterm.c (x_scroll_bar_expose, handle_one_xevent)
(mark_xterm): Avoid compiler warnings.  (Bug#56551)
---

diff --git a/src/xterm.c b/src/xterm.c
index 2ccd6b1613d..ecc00e6bef2 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -14967,10 +14967,10 @@ x_scroll_bar_expose (struct scroll_bar *bar, const XEvent *event)
 {
 #ifndef HAVE_XDBE
   Window w = bar->x_window;
+  int x, y, width, height;
 #else
   Drawable w = bar->x_drawable;
 #endif
-  int x, y, width, height;
 
   if (event->type == Expose)
     {
@@ -18670,10 +18670,12 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 	       configureEvent.xconfigure.height,
 	       f->new_width, f->new_height);
 
+#ifdef HAVE_XDBE
 	  block_input ();
           if (FRAME_X_DOUBLE_BUFFERED_P (f))
             x_drop_xrender_surfaces (f);
           unblock_input ();
+#endif
           xg_frame_resized (f, configureEvent.xconfigure.width,
                             configureEvent.xconfigure.height);
 #ifdef USE_CAIRO
@@ -27934,7 +27936,8 @@ void
 mark_xterm (void)
 {
   Lisp_Object val;
-#if defined HAVE_XINPUT2 || defined USE_TOOLKIT_SCROLL_BARS
+#if defined HAVE_XINPUT2 || defined USE_TOOLKIT_SCROLL_BARS \
+  || defined HAVE_XRANDR || defined USE_GTK
   struct x_display_info *dpyinfo;
   int i;
 #endif