From eedc0b19fdc375665e5b3251aa79d460ca73e778 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Mon, 3 Nov 2025 10:39:31 -0800
Subject: [PATCH] Fixed build warning when X11 XInput isn't available
---
src/video/x11/SDL_x11xinput2.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/video/x11/SDL_x11xinput2.c b/src/video/x11/SDL_x11xinput2.c
index 9b3c7c543ff02..46d0c1a407c78 100644
--- a/src/video/x11/SDL_x11xinput2.c
+++ b/src/video/x11/SDL_x11xinput2.c
@@ -228,26 +228,18 @@ static void xinput2_normalize_touch_coordinates(SDL_Window *window, double in_x,
}
#endif // SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
-#endif // SDL_VIDEO_DRIVER_X11_XINPUT2
-
static bool X11_Xinput2IsMultitouchSupported(void)
{
-#ifdef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
return xinput2_initialized && xinput2_multitouch_supported;
-#else
- return false;
-#endif
}
static bool X11_Xinput2IsScrollingSupported(void)
{
-#ifdef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_SCROLLINFO
return xinput2_initialized && xinput2_scrolling_supported;
-#else
- return false;
-#endif
}
+#endif // SDL_VIDEO_DRIVER_X11_XINPUT2
+
bool X11_InitXinput2(SDL_VideoDevice *_this)
{
#ifdef SDL_VIDEO_DRIVER_X11_XINPUT2