windows: Fixed some Visual Studio warnings about shadowed variables.
authorRyan C. Gordon <icculus@icculus.org>
Sun, 22 Jul 2018 19:28:27 -0400
changeset 120670e37a23d93cb
parent 12065 abc706dbb7af
child 12068 ce88faaf8bd2
windows: Fixed some Visual Studio warnings about shadowed variables.

Fixes Bugzilla #4118.
src/joystick/windows/SDL_mmjoystick.c
src/video/windows/SDL_windowswindow.c
     1.1 --- a/src/joystick/windows/SDL_mmjoystick.c	Fri Jun 29 18:29:17 2018 +0300
     1.2 +++ b/src/joystick/windows/SDL_mmjoystick.c	Sun Jul 22 19:28:27 2018 -0400
     1.3 @@ -366,10 +366,7 @@
     1.4  
     1.5      /* joystick hat events */
     1.6      if (joyinfo.dwFlags & JOY_RETURNPOV) {
     1.7 -        Uint8 pos;
     1.8 -
     1.9 -        pos = TranslatePOV(joyinfo.dwPOV);
    1.10 -        SDL_PrivateJoystickHat(joystick, 0, pos);
    1.11 +        SDL_PrivateJoystickHat(joystick, 0, TranslatePOV(joyinfo.dwPOV));
    1.12      }
    1.13  }
    1.14  
     2.1 --- a/src/video/windows/SDL_windowswindow.c	Fri Jun 29 18:29:17 2018 +0300
     2.2 +++ b/src/video/windows/SDL_windowswindow.c	Sun Jul 22 19:28:27 2018 -0400
     2.3 @@ -219,8 +219,6 @@
     2.4              if ((window->windowed.w && window->windowed.w != w) || (window->windowed.h && window->windowed.h != h)) {
     2.5                  /* We tried to create a window larger than the desktop and Windows didn't allow it.  Override! */
     2.6                  int x, y;
     2.7 -                int w, h;
     2.8 -
     2.9                  /* Figure out what the window area will be */
    2.10                  WIN_AdjustWindowRect(window, &x, &y, &w, &h, SDL_FALSE);
    2.11                  SetWindowPos(hwnd, HWND_NOTOPMOST, x, y, w, h, SWP_NOCOPYBITS | SWP_NOZORDER | SWP_NOACTIVATE);