eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-06-02 18:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed clang Windows build

Browse source
This commit is contained in:
Sam Lantinga 2023-07-08 14:10:08 -07:00
parent a29aac603b
commit cd97e3a833
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -499,7 +499,10 @@ static HRESULT STDMETHODCALLTYPE IEventHandler_CGamepadVtbl_InvokeRemoved(__FIEv
return S_OK; return S_OK;
} }
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4028) /* formal parameter 3 different from declaration, when using older buggy WGI headers */ #pragma warning(disable : 4028) /* formal parameter 3 different from declaration, when using older buggy WGI headers */
#endif
static __FIEventHandler_1_Windows__CGaming__CInput__CGamepadVtbl gamepad_added_vtbl = { static __FIEventHandler_1_Windows__CGaming__CInput__CGamepadVtbl gamepad_added_vtbl = {
IEventHandler_CGamepadVtbl_QueryInterface, IEventHandler_CGamepadVtbl_QueryInterface,
@ -523,6 +526,10 @@ static GamepadDelegate gamepad_removed = {
{ 1 } { 1 }
}; };
#ifdef _MSC_VER
#pragma warning(pop)
#endif
static void RAWINPUT_MarkWindowsGamingInputSlotUsed(WindowsGamingInputGamepadState *wgi_slot, RAWINPUT_DeviceContext *ctx) static void RAWINPUT_MarkWindowsGamingInputSlotUsed(WindowsGamingInputGamepadState *wgi_slot, RAWINPUT_DeviceContext *ctx)
{ {
wgi_slot->used = SDL_TRUE; wgi_slot->used = SDL_TRUE;

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

@ -567,7 +567,10 @@ static HRESULT STDMETHODCALLTYPE IEventHandler_CRawGameControllerVtbl_InvokeRemo
return S_OK; return S_OK;
} }
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4028) /* formal parameter 3 different from declaration, when using older buggy WGI headers */ #pragma warning(disable : 4028) /* formal parameter 3 different from declaration, when using older buggy WGI headers */
#endif
static __FIEventHandler_1_Windows__CGaming__CInput__CRawGameControllerVtbl controller_added_vtbl = { static __FIEventHandler_1_Windows__CGaming__CInput__CRawGameControllerVtbl controller_added_vtbl = {
IEventHandler_CRawGameControllerVtbl_QueryInterface, IEventHandler_CRawGameControllerVtbl_QueryInterface,
@ -591,6 +594,10 @@ static RawGameControllerDelegate controller_removed = {
{ 1 } { 1 }
}; };
#ifdef _MSC_VER
#pragma warning(pop)
#endif
static int WGI_JoystickInit(void) static int WGI_JoystickInit(void)
{ {
HRESULT hr; HRESULT hr;