From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 14 Jul 2022 15:56:46 +0000 (+0300)
Subject: ; * src/xterm.c (x_scroll_bar_expose, mark_xterm): Fix last change.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~1886^2~938
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8c6402844ed39c88bc22fb4cc497e700631a1e3c;p=emacs.git

; * src/xterm.c (x_scroll_bar_expose, mark_xterm): Fix last change.
---

diff --git a/src/xterm.c b/src/xterm.c
index ecc00e6bef2..94fb0bfa1a0 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -14967,10 +14967,9 @@ 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)
     {
@@ -14986,6 +14985,7 @@ x_scroll_bar_expose (struct scroll_bar *bar, const XEvent *event)
       width = event->xgraphicsexpose.width;
       height = event->xgraphicsexpose.height;
     }
+#endif
 
   struct frame *f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
   GC gc = f->output_data.x->normal_gc;
@@ -27939,7 +27939,9 @@ mark_xterm (void)
 #if defined HAVE_XINPUT2 || defined USE_TOOLKIT_SCROLL_BARS \
   || defined HAVE_XRANDR || defined USE_GTK
   struct x_display_info *dpyinfo;
+#if defined HAVE_XINPUT2 || defined USE_TOOLKIT_SCROLL_BARS
   int i;
+#endif
 #endif
 
   if (x_dnd_return_frame_object)