From 6545e5b0b8b897540bc4cfc2c86221c10a0ad180 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Tue, 19 May 2026 18:55:20 +0300 Subject: [PATCH] SDL_rawinputjoystick.c: fixed a type redefinition error (cherry picked from commit f19dca3ca0c10f6417ac503288120ccd064cd4f4) --- src/joystick/windows/SDL_rawinputjoystick.c | 4 ++-- src/joystick/windows/SDL_windows_gaming_input.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/joystick/windows/SDL_rawinputjoystick.c b/src/joystick/windows/SDL_rawinputjoystick.c index 7a69775e26..6846288aa7 100644 --- a/src/joystick/windows/SDL_rawinputjoystick.c +++ b/src/joystick/windows/SDL_rawinputjoystick.c @@ -56,7 +56,7 @@ #ifdef SDL_JOYSTICK_RAWINPUT_WGI #include "../../core/windows/SDL_windows.h" -typedef struct WindowsGamingInputGamepadState WindowsGamingInputGamepadState; +struct WindowsGamingInputGamepadState; #define GamepadButtons_GUIDE 0x40000000 #define COBJMACROS #include "windows.gaming.input.h" @@ -157,7 +157,7 @@ struct joystick_hwdata Uint8 wgi_correlation_id; Uint8 wgi_correlation_count; Uint8 wgi_uncorrelate_count; - WindowsGamingInputGamepadState *wgi_slot; + struct WindowsGamingInputGamepadState *wgi_slot; struct __x_ABI_CWindows_CGaming_CInput_CGamepadVibration vibration; #endif diff --git a/src/joystick/windows/SDL_windows_gaming_input.c b/src/joystick/windows/SDL_windows_gaming_input.c index 339a279147..f9076740ac 100644 --- a/src/joystick/windows/SDL_windows_gaming_input.c +++ b/src/joystick/windows/SDL_windows_gaming_input.c @@ -609,7 +609,7 @@ static bool WGI_JoystickInit(void) * As a workaround, we will keep a reference to the MTA to prevent COM from unloading DLLs later. * See https://github.com/libsdl-org/SDL/issues/5552 for more details. */ - static HANDLE cookie = NULL; // CO_MTA_USAGE_COOKIE* + static HANDLE cookie = NULL; // CO_MTA_USAGE_COOKIE if (!cookie) { hr = wgi.CoIncrementMTAUsage(&cookie); if (FAILED(hr)) {