From: Po Lu <luangruo@yahoo.com>
Date: Mon, 8 Aug 2022 03:59:08 +0000 (+0800)
Subject: Fix warnings outside XI2 builds
X-Git-Tag: emacs-29.0.90~1447^2~328
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9b661ff1a8e0fc3fc809a42a187356d6cb5ad2c9;p=emacs.git

Fix warnings outside XI2 builds

* src/xterm.c (x_query_pointer): Juggle some definitions around.
---

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