ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-23 18:15:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use "exp" as a name so that it's doesn´t show up with searching for the function

Browse source
This commit is contained in:
Sylvain 2021-11-22 11:16:23 +01:00 committed by Sam Lantinga
parent 161dd83c9a
commit 6fb50bd0a6
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/joystick/bsd/SDL_bsdjoystick.c
View file

@ -552,7 +552,7 @@ BSD_JoystickUpdate(SDL_Joystick *joy)
if (joy->hwdata->type == BSDJOY_JOY) { if (joy->hwdata->type == BSDJOY_JOY) {
while (read(joy->hwdata->fd, &gameport, sizeof gameport) == sizeof gameport) { while (read(joy->hwdata->fd, &gameport, sizeof gameport) == sizeof gameport) {
if (abs(x - gameport.x) > 8) { if (SDL_abs(x - gameport.x) > 8) {
x = gameport.x; x = gameport.x;
if (x < xmin) { if (x < xmin) {
xmin = x; xmin = x;
@ -569,7 +569,7 @@ BSD_JoystickUpdate(SDL_Joystick *joy)
v *= 32768 / ((xmax - xmin + 1) / 2); v *= 32768 / ((xmax - xmin + 1) / 2);
SDL_PrivateJoystickAxis(joy, 0, v); SDL_PrivateJoystickAxis(joy, 0, v);
} }
if (abs(y - gameport.y) > 8) { if (SDL_abs(y - gameport.y) > 8) {
y = gameport.y; y = gameport.y;
if (y < ymin) { if (y < ymin) {
ymin = y; ymin = y;

4
src/joystick/windows/SDL_dinputjoystick.c
View file

@ -432,7 +432,7 @@ SDL_DINPUT_JoystickInit(void)
static BOOL CALLBACK static BOOL CALLBACK
EnumJoystickDetectCallback(LPCDIDEVICEINSTANCE pDeviceInstance, LPVOID pContext) EnumJoystickDetectCallback(LPCDIDEVICEINSTANCE pDeviceInstance, LPVOID pContext)
{ {
#define CHECK(exp) { if(!(exp)) goto err; } #define CHECK(expression) { if(!(expression)) goto err; }
JoyStick_DeviceData *pNewJoystick = NULL; JoyStick_DeviceData *pNewJoystick = NULL;
JoyStick_DeviceData *pPrevJoystick = NULL; JoyStick_DeviceData *pPrevJoystick = NULL;
Uint16 *guid16; Uint16 *guid16;
@ -553,7 +553,7 @@ typedef struct
static BOOL CALLBACK static BOOL CALLBACK
EnumJoystickPresentCallback(LPCDIDEVICEINSTANCE pDeviceInstance, LPVOID pContext) EnumJoystickPresentCallback(LPCDIDEVICEINSTANCE pDeviceInstance, LPVOID pContext)
{ {
#define CHECK(exp) { if(!(exp)) goto err; } #define CHECK(expression) { if(!(expression)) goto err; }
Joystick_PresentData *pData = (Joystick_PresentData *)pContext; Joystick_PresentData *pData = (Joystick_PresentData *)pContext;
Uint16 vendor = 0; Uint16 vendor = 0;
Uint16 product = 0; Uint16 product = 0;

2
src/joystick/windows/SDL_rawinputjoystick.c
View file

@ -679,7 +679,7 @@ RAWINPUT_DeviceFromHandle(HANDLE hDevice)
static void static void
RAWINPUT_AddDevice(HANDLE hDevice) RAWINPUT_AddDevice(HANDLE hDevice)
{ {
#define CHECK(exp) { if(!(exp)) goto err; } #define CHECK(expression) { if(!(expression)) goto err; }
SDL_RAWINPUT_Device *device = NULL; SDL_RAWINPUT_Device *device = NULL;
SDL_RAWINPUT_Device *curr, *last; SDL_RAWINPUT_Device *curr, *last;
RID_DEVICE_INFO rdi; RID_DEVICE_INFO rdi;