Relintai/sdl2_frt
1
0
Fork 0
mirror of https://github.com/Relintai/sdl2_frt.git synced 2024-12-16 11:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

windows: Fixed some Visual Studio warnings about shadowed variables.

Browse Source 
Fixes Bugzilla #4118.
This commit is contained in:
Ryan C. Gordon 2018-07-22 19:28:27 -04:00
parent 3a11bba267
commit 862aa4b47d
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/joystick/windows/SDL_mmjoystick.c
View File

@ -366,10 +366,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
/* joystick hat events */ /* joystick hat events */
if (joyinfo.dwFlags & JOY_RETURNPOV) { if (joyinfo.dwFlags & JOY_RETURNPOV) {
Uint8 pos; SDL_PrivateJoystickHat(joystick, 0, TranslatePOV(joyinfo.dwPOV));
pos = TranslatePOV(joyinfo.dwPOV);
SDL_PrivateJoystickHat(joystick, 0, pos);
} }
} }

2
src/video/windows/SDL_windowswindow.c
View File

@ -219,8 +219,6 @@ SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, HWND parent, SDL_bool cre
if ((window->windowed.w && window->windowed.w != w) || (window->windowed.h && window->windowed.h != h)) { if ((window->windowed.w && window->windowed.w != w) || (window->windowed.h && window->windowed.h != h)) {
/* We tried to create a window larger than the desktop and Windows didn't allow it. Override! */ /* We tried to create a window larger than the desktop and Windows didn't allow it. Override! */
int x, y; int x, y;
int w, h;
/* Figure out what the window area will be */ /* Figure out what the window area will be */
WIN_AdjustWindowRect(window, &x, &y, &w, &h, SDL_FALSE); WIN_AdjustWindowRect(window, &x, &y, &w, &h, SDL_FALSE);
SetWindowPos(hwnd, HWND_NOTOPMOST, x, y, w, h, SWP_NOCOPYBITS | SWP_NOZORDER | SWP_NOACTIVATE); SetWindowPos(hwnd, HWND_NOTOPMOST, x, y, w, h, SWP_NOCOPYBITS | SWP_NOZORDER | SWP_NOACTIVATE);