emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master c02986e4c3: ; Fix compilation warnings in a build --without-all


From: Eli Zaretskii
Subject: master c02986e4c3: ; Fix compilation warnings in a build --without-all
Date: Thu, 14 Jul 2022 09:38:35 -0400 (EDT)

branch: master
commit c02986e4c3c46aee6bf6ad4c0e9acd7ba9f906df
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    ; 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)
---
 src/xterm.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/xterm.c b/src/xterm.c
index 2ccd6b1613..ecc00e6bef 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]