BramReuling/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-06-06 06:34:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

SDL_rawinputjoystick.c: fixed a type redefinition error

Browse source 
(cherry picked from commit f19dca3ca0)
This commit is contained in:
Ozkan Sezer 2026-05-19 18:55:20 +03:00
parent eb8caad5a4
commit 6545e5b0b8
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/joystick/windows/SDL_rawinputjoystick.c
View file

@ -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

2
src/joystick/windows/SDL_windows_gaming_input.c
View file

@ -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)) {