From 1040baa2c1731590e7077efd44d32ac8dd2694ae Mon Sep 17 00:00:00 2001 From: Hyper <34012267+hyperbx@users.noreply.github.com> Date: Thu, 17 Oct 2024 17:11:20 +0100 Subject: [PATCH] sdl_hid: rename SDL event handler to prevent conflicts --- UnleashedRecomp/hid/driver/sdl_hid.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UnleashedRecomp/hid/driver/sdl_hid.cpp b/UnleashedRecomp/hid/driver/sdl_hid.cpp index f3066f1..bcd8949 100644 --- a/UnleashedRecomp/hid/driver/sdl_hid.cpp +++ b/UnleashedRecomp/hid/driver/sdl_hid.cpp @@ -135,7 +135,7 @@ inline Controller* FindController(int which) return nullptr; } -int OnSDLEvent(void*, SDL_Event* event) +int HID_OnSDLEvent(void*, SDL_Event* event) { if (event->type >= SDL_CONTROLLERAXISMOTION && event->type < SDL_FINGERDOWN) { @@ -185,7 +185,7 @@ void hid::detail::Init() SDL_InitSubSystem(SDL_INIT_EVENTS); - SDL_AddEventWatch(OnSDLEvent, nullptr); + SDL_AddEventWatch(HID_OnSDLEvent, nullptr); SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER); }