Fixed some compile errors and warnings under Visual C++
authorSam Lantinga <slouken@libsdl.org>
Fri, 12 Jun 2009 08:41:48 +0000
changeset 3196413672b09bb3
parent 3195 08747e24a50f
child 3197 434ce3242e1c
Fixed some compile errors and warnings under Visual C++
src/video/SDL_video.c
src/video/win32/SDL_win32video.h
src/video/win32/SDL_win32window.c
     1.1 --- a/src/video/SDL_video.c	Thu Jun 11 20:08:33 2009 +0000
     1.2 +++ b/src/video/SDL_video.c	Fri Jun 12 08:41:48 2009 +0000
     1.3 @@ -1630,7 +1630,7 @@
     1.4          if (surface->format->Amask
     1.5              || !(surface->map->info.flags &
     1.6                   (SDL_COPY_COLORKEY | SDL_COPY_MASK | SDL_COPY_BLEND))) {
     1.7 -            int it;
     1.8 +            Uint32 it;
     1.9              int pfmt;
    1.10  
    1.11              /* Pixel formats, sorted by best first */
    1.12 @@ -1724,7 +1724,7 @@
    1.13              }
    1.14          } else {
    1.15              /* Need a format with alpha */
    1.16 -            int it;
    1.17 +            Uint32 it;
    1.18              int apfmt;
    1.19  
    1.20              /* Pixel formats with alpha, sorted by best first */
     2.1 --- a/src/video/win32/SDL_win32video.h	Thu Jun 11 20:08:33 2009 +0000
     2.2 +++ b/src/video/win32/SDL_win32video.h	Fri Jun 12 08:41:48 2009 +0000
     2.3 @@ -87,7 +87,7 @@
     2.4  /* *INDENT-ON* */
     2.5  
     2.6      int keyboard;
     2.7 -    SDL_scancode *key_layout;
     2.8 +    const SDL_scancode *key_layout;
     2.9  } SDL_VideoData;
    2.10  
    2.11  #endif /* _SDL_win32video_h */
     3.1 --- a/src/video/win32/SDL_win32window.c	Thu Jun 11 20:08:33 2009 +0000
     3.2 +++ b/src/video/win32/SDL_win32window.c	Fri Jun 12 08:41:48 2009 +0000
     3.3 @@ -642,6 +642,7 @@
     3.4  {
     3.5      HINSTANCE hInstance = GetModuleHandle(NULL);
     3.6      WNDCLASS wce;
     3.7 +    HWND hWndParent = NULL;
     3.8  
     3.9      /* Make sure window isn't created twice. */
    3.10      if (SDL_HelperWindow != NULL) {
    3.11 @@ -662,7 +663,6 @@
    3.12          return -1;
    3.13      }
    3.14  
    3.15 -    HWND hWndParent = NULL;
    3.16  #ifndef _WIN32_WCE
    3.17      /* WinCE doesn't have HWND_MESSAGE */
    3.18      hWndParent = HWND_MESSAGE;