Browse Source

Updated API for SDL_JoystickID sign change

Sam Lantinga 2 years ago
parent
commit
decbbb0499
2 changed files with 4 additions and 4 deletions
  1. 2 2
      src/joystick/linux/SDL_sysjoystick.c
  2. 2 2
      src/joystick/steam/SDL_steamcontroller.h

+ 2 - 2
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;

+ 2 - 2
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);