From 9b661ff1a8e0fc3fc809a42a187356d6cb5ad2c9 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Mon, 8 Aug 2022 11:59:08 +0800 Subject: [PATCH] Fix warnings outside XI2 builds * src/xterm.c (x_query_pointer): Juggle some definitions around. --- src/xterm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xterm.c b/src/xterm.c index c1f74f68666..23a35aa1618 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -13091,10 +13091,10 @@ x_query_pointer (Display *dpy, Window w, Window *root_return, int *root_y_return, int *win_x_return, int *win_y_return, unsigned int *mask_return) { - struct x_display_info *dpyinfo; Bool rc; - bool had_errors; #ifdef HAVE_XINPUT2 + struct x_display_info *dpyinfo; + bool had_errors; XIModifierState modifiers; XIButtonState buttons; XIGroupState group; /* Unused. */ @@ -13102,8 +13102,8 @@ x_query_pointer (Display *dpy, Window w, Window *root_return, unsigned int state; #endif - dpyinfo = x_display_info_for_display (dpy); #ifdef HAVE_XINPUT2 + dpyinfo = x_display_info_for_display (dpy); if (dpyinfo && dpyinfo->client_pointer_device != -1) { /* Catch errors caused by the device going away. This is not -- 2.39.2