Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2025-02-17 20:34:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warnings

Browse Source
This commit is contained in:
Jimb Esser 2020-03-16 14:49:20 -07:00
parent 8cd08646bb
commit 47da53b91d
6 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/joystick/hidapi/SDL_hidapi_gamecube.c
View File

@ -404,7 +404,8 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverGameCube =
HIDAPI_DriverGameCube_OpenJoystick, HIDAPI_DriverGameCube_OpenJoystick,
HIDAPI_DriverGameCube_RumbleJoystick, HIDAPI_DriverGameCube_RumbleJoystick,
HIDAPI_DriverGameCube_CloseJoystick, HIDAPI_DriverGameCube_CloseJoystick,
HIDAPI_DriverGameCube_FreeDevice HIDAPI_DriverGameCube_FreeDevice,
NULL,
}; };
#endif /* SDL_JOYSTICK_HIDAPI_GAMECUBE */ #endif /* SDL_JOYSTICK_HIDAPI_GAMECUBE */

3
src/joystick/hidapi/SDL_hidapi_ps4.c
View File

@ -529,7 +529,8 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverPS4 =
HIDAPI_DriverPS4_OpenJoystick, HIDAPI_DriverPS4_OpenJoystick,
HIDAPI_DriverPS4_RumbleJoystick, HIDAPI_DriverPS4_RumbleJoystick,
HIDAPI_DriverPS4_CloseJoystick, HIDAPI_DriverPS4_CloseJoystick,
HIDAPI_DriverPS4_FreeDevice HIDAPI_DriverPS4_FreeDevice,
NULL
}; };
#endif /* SDL_JOYSTICK_HIDAPI_PS4 */ #endif /* SDL_JOYSTICK_HIDAPI_PS4 */

3
src/joystick/hidapi/SDL_hidapi_switch.c
View File

@ -1164,7 +1164,8 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverSwitch =
HIDAPI_DriverSwitch_OpenJoystick, HIDAPI_DriverSwitch_OpenJoystick,
HIDAPI_DriverSwitch_RumbleJoystick, HIDAPI_DriverSwitch_RumbleJoystick,
HIDAPI_DriverSwitch_CloseJoystick, HIDAPI_DriverSwitch_CloseJoystick,
HIDAPI_DriverSwitch_FreeDevice HIDAPI_DriverSwitch_FreeDevice,
NULL
}; };
#endif /* SDL_JOYSTICK_HIDAPI_SWITCH */ #endif /* SDL_JOYSTICK_HIDAPI_SWITCH */

3
src/joystick/hidapi/SDL_hidapi_xbox360.c
View File

@ -991,6 +991,7 @@ HIDAPI_DriverXbox360_HandleStatePacket(SDL_Joystick *joystick, hid_device *dev,
static void static void
HIDAPI_DriverXbox360_UpdateOtherAPIs(SDL_HIDAPI_Device *device, SDL_Joystick *joystick) HIDAPI_DriverXbox360_UpdateOtherAPIs(SDL_HIDAPI_Device *device, SDL_Joystick *joystick)
{ {
#if defined(SDL_JOYSTICK_HIDAPI_WINDOWS_MATCHING) || defined(SDL_JOYSTICK_HIDAPI_WINDOWS_XINPUT) || defined(SDL_JOYSTICK_HIDAPI_WINDOWS_GAMING_INPUT)
SDL_DriverXbox360_Context *ctx = (SDL_DriverXbox360_Context *)device->context; SDL_DriverXbox360_Context *ctx = (SDL_DriverXbox360_Context *)device->context;
SDL_bool has_trigger_data = SDL_FALSE; SDL_bool has_trigger_data = SDL_FALSE;
SDL_bool correlated = SDL_FALSE; SDL_bool correlated = SDL_FALSE;
@ -1215,7 +1216,7 @@ HIDAPI_DriverXbox360_UpdateOtherAPIs(SDL_HIDAPI_Device *device, SDL_Joystick *jo
} }
} }
#endif #endif
#endif
} }
static SDL_bool static SDL_bool

3
src/joystick/hidapi/SDL_hidapi_xbox360w.c
View File

@ -296,7 +296,8 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverXbox360W =
HIDAPI_DriverXbox360W_OpenJoystick, HIDAPI_DriverXbox360W_OpenJoystick,
HIDAPI_DriverXbox360W_RumbleJoystick, HIDAPI_DriverXbox360W_RumbleJoystick,
HIDAPI_DriverXbox360W_CloseJoystick, HIDAPI_DriverXbox360W_CloseJoystick,
HIDAPI_DriverXbox360W_FreeDevice HIDAPI_DriverXbox360W_FreeDevice,
NULL
}; };
#endif /* SDL_JOYSTICK_HIDAPI_XBOX360 */ #endif /* SDL_JOYSTICK_HIDAPI_XBOX360 */

5
src/joystick/hidapi/SDL_hidapi_xboxone.c
View File

@ -763,7 +763,7 @@ HIDAPI_DriverXboxOne_UpdateDevice(SDL_HIDAPI_Device *device)
if (size < 0) { if (size < 0) {
/* Read error, device is disconnected */ /* Read error, device is disconnected */
HIDAPI_JoystickDisconnected(device, joystick->instance_id); HIDAPI_JoystickDisconnected(device, joystick->instance_id, SDL_FALSE);
} }
return (size >= 0); return (size >= 0);
} }
@ -796,7 +796,8 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverXboxOne =
HIDAPI_DriverXboxOne_OpenJoystick, HIDAPI_DriverXboxOne_OpenJoystick,
HIDAPI_DriverXboxOne_RumbleJoystick, HIDAPI_DriverXboxOne_RumbleJoystick,
HIDAPI_DriverXboxOne_CloseJoystick, HIDAPI_DriverXboxOne_CloseJoystick,
HIDAPI_DriverXboxOne_FreeDevice HIDAPI_DriverXboxOne_FreeDevice,
NULL
}; };
#endif /* SDL_JOYSTICK_HIDAPI_XBOXONE */ #endif /* SDL_JOYSTICK_HIDAPI_XBOXONE */