From dc36f133b46fa8b7a07943b8664bcd80725ad75a Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 20 Mar 2020 19:49:15 -0700 Subject: [PATCH] Backed out changeset c29d04c3fa49 --- src/joystick/windows/SDL_rawinputjoystick.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/joystick/windows/SDL_rawinputjoystick.c b/src/joystick/windows/SDL_rawinputjoystick.c index 0e6df26b6..9d2471ac1 100644 --- a/src/joystick/windows/SDL_rawinputjoystick.c +++ b/src/joystick/windows/SDL_rawinputjoystick.c @@ -240,7 +240,6 @@ RAWINPUT_DeviceFromHandle(HANDLE hDevice) static SDL_HIDAPI_DeviceDriver * RAWINPUT_GetDeviceDriver(SDL_RAWINPUT_Device *device) { - SDL_GameControllerType type; int i; if (SDL_ShouldIgnoreJoystick(device->name, device->guid)) { @@ -254,7 +253,7 @@ RAWINPUT_GetDeviceDriver(SDL_RAWINPUT_Device *device) return NULL; } - type = SDL_GetJoystickGameControllerType("", device->vendor_id, device->product_id, -1, 0, 0, 0); + SDL_GameControllerType type = SDL_GetJoystickGameControllerType("", device->vendor_id, device->product_id, -1, 0, 0, 0); for (i = 0; i < SDL_arraysize(SDL_RAWINPUT_drivers); ++i) { SDL_HIDAPI_DeviceDriver *driver = SDL_RAWINPUT_drivers[i]; @@ -364,8 +363,6 @@ static void RAWINPUT_DelDevice(SDL_RAWINPUT_Device *device, SDL_bool send_event) { SDL_RAWINPUT_Device *curr, *last; - SDL_Joystick *joystick; - for (curr = SDL_RAWINPUT_devices, last = NULL; curr; last = curr, curr = curr->next) { if (curr == device) { if (last) { @@ -375,7 +372,7 @@ RAWINPUT_DelDevice(SDL_RAWINPUT_Device *device, SDL_bool send_event) } --SDL_RAWINPUT_numjoysticks; - joystick = device->joystick; + SDL_Joystick *joystick = device->joystick; if (joystick) { /* Detach from joystick */ RAWINPUT_JoystickClose(joystick);