From decbbb049927d555e43f5fa9af3f0d270d8e09ff Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 13 Jan 2023 14:20:59 -0800 Subject: [PATCH] Updated API for SDL_JoystickID sign change --- src/joystick/linux/SDL_sysjoystick.c | 4 ++-- src/joystick/steam/SDL_steamcontroller.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c index 5d2703c5a..bc282b70b 100644 --- a/src/joystick/linux/SDL_sysjoystick.c +++ b/src/joystick/linux/SDL_sysjoystick.c @@ -421,7 +421,7 @@ static void HandlePendingRemovals(void) } } -static SDL_bool SteamControllerConnectedCallback(const char *name, SDL_JoystickGUID guid, int *device_instance) +static SDL_bool SteamControllerConnectedCallback(const char *name, SDL_JoystickGUID guid, SDL_JoystickID *device_instance) { SDL_joylist_item *item; @@ -456,7 +456,7 @@ static SDL_bool SteamControllerConnectedCallback(const char *name, SDL_JoystickG return SDL_TRUE; } -static void SteamControllerDisconnectedCallback(int device_instance) +static void SteamControllerDisconnectedCallback(SDL_JoystickID device_instance) { SDL_joylist_item *item; SDL_joylist_item *prev = NULL; diff --git a/src/joystick/steam/SDL_steamcontroller.h b/src/joystick/steam/SDL_steamcontroller.h index 1767fb0a4..f3755af04 100644 --- a/src/joystick/steam/SDL_steamcontroller.h +++ b/src/joystick/steam/SDL_steamcontroller.h @@ -24,8 +24,8 @@ #include "SDL_internal.h" -typedef SDL_bool (*SteamControllerConnectedCallback_t)(const char *name, SDL_JoystickGUID guid, int *device_instance); -typedef void (*SteamControllerDisconnectedCallback_t)(int device_instance); +typedef SDL_bool (*SteamControllerConnectedCallback_t)(const char *name, SDL_JoystickGUID guid, SDL_JoystickID *device_instance); +typedef void (*SteamControllerDisconnectedCallback_t)(SDL_JoystickID device_instance); void SDL_InitSteamControllers(SteamControllerConnectedCallback_t connectedCallback, SteamControllerDisconnectedCallback_t disconnectedCallback);