Fixed some compile errors and warnings under Visual C++
authorSam Lantinga <slouken@libsdl.org>
Fri, 12 Jun 2009 08:41:48 +0000
changeset 3196 413672b09bb3
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
--- a/src/video/SDL_video.c	Thu Jun 11 20:08:33 2009 +0000
+++ b/src/video/SDL_video.c	Fri Jun 12 08:41:48 2009 +0000
@@ -1630,7 +1630,7 @@
         if (surface->format->Amask
             || !(surface->map->info.flags &
                  (SDL_COPY_COLORKEY | SDL_COPY_MASK | SDL_COPY_BLEND))) {
-            int it;
+            Uint32 it;
             int pfmt;
 
             /* Pixel formats, sorted by best first */
@@ -1724,7 +1724,7 @@
             }
         } else {
             /* Need a format with alpha */
-            int it;
+            Uint32 it;
             int apfmt;
 
             /* Pixel formats with alpha, sorted by best first */
--- a/src/video/win32/SDL_win32video.h	Thu Jun 11 20:08:33 2009 +0000
+++ b/src/video/win32/SDL_win32video.h	Fri Jun 12 08:41:48 2009 +0000
@@ -87,7 +87,7 @@
 /* *INDENT-ON* */
 
     int keyboard;
-    SDL_scancode *key_layout;
+    const SDL_scancode *key_layout;
 } SDL_VideoData;
 
 #endif /* _SDL_win32video_h */
--- a/src/video/win32/SDL_win32window.c	Thu Jun 11 20:08:33 2009 +0000
+++ b/src/video/win32/SDL_win32window.c	Fri Jun 12 08:41:48 2009 +0000
@@ -642,6 +642,7 @@
 {
     HINSTANCE hInstance = GetModuleHandle(NULL);
     WNDCLASS wce;
+    HWND hWndParent = NULL;
 
     /* Make sure window isn't created twice. */
     if (SDL_HelperWindow != NULL) {
@@ -662,7 +663,6 @@
         return -1;
     }
 
-    HWND hWndParent = NULL;
 #ifndef _WIN32_WCE
     /* WinCE doesn't have HWND_MESSAGE */
     hWndParent = HWND_MESSAGE;