From 1c43511dbc856509f50642f6a8bfb88f5ff5d96d Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Mon, 8 Dec 2025 10:37:22 -0800
Subject: Fix xmenu.c USE_X_TOOLKIT duplication

* src/xmenu.c (Fx_menu_bar_open_internal):
Don’t say ‘#ifdef USE_X_TOOLKIT’ inside an #if where
it is already known that USE_X_TOOLKIT is defined.
---
 src/xmenu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/xmenu.c b/src/xmenu.c
index f95c50b1833..1a58b1e1427 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -474,7 +474,7 @@ DEFUN ("x-menu-bar-open-internal", Fx_menu_bar_open_internal, Sx_menu_bar_open_i
 {
   XEvent ev;
   struct frame *f = decode_window_system_frame (frame);
-#if defined USE_X_TOOLKIT && defined HAVE_XINPUT2
+#ifdef HAVE_XINPUT2
   struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (f);
 #endif
   Widget menubar;
@@ -489,7 +489,7 @@ DEFUN ("x-menu-bar-open-internal", Fx_menu_bar_open_internal, Sx_menu_bar_open_i
       Window child;
       bool error_p = false;
 
-#if defined USE_X_TOOLKIT && defined HAVE_XINPUT2
+#ifdef HAVE_XINPUT2
       /* Clear the XI2 grab so Motif or lwlib can set a core grab.
 	 Otherwise some versions of Motif will emit a warning and hang,
 	 and lwlib will fail to destroy the menu window.  */
-- 
cgit v1.2.1