summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2022-07-14 18:56:46 +0300
committerEli Zaretskii <eliz@gnu.org>2022-07-14 18:56:46 +0300
commit8c6402844ed39c88bc22fb4cc497e700631a1e3c (patch)
tree1408946f7b6f12a351164d0c54ed3ff6a3c463ab
parentfdf110b8845248ad932bf774614a4fad95189c74 (diff)
downloademacs-8c6402844ed39c88bc22fb4cc497e700631a1e3c.tar.gz
; * src/xterm.c (x_scroll_bar_expose, mark_xterm): Fix last change.
-rw-r--r--src/xterm.c6
1 files changed, 4 insertions, 2 deletions
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,8 +27939,10 @@ 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)
{