pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some compile errors and warnings under Visual C++

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403655
This commit is contained in:
Sam Lantinga 2009-06-12 08:41:48 +00:00
parent 75ffaf1d21
commit e2f3d399b5
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/video/SDL_video.c
View file

@ -1630,7 +1630,7 @@ SDL_CreateTextureFromSurface(Uint32 format, SDL_Surface * surface)
if (surface->format->Amask if (surface->format->Amask
|| !(surface->map->info.flags & || !(surface->map->info.flags &
(SDL_COPY_COLORKEY | SDL_COPY_MASK | SDL_COPY_BLEND))) { (SDL_COPY_COLORKEY | SDL_COPY_MASK | SDL_COPY_BLEND))) {
int it; Uint32 it;
int pfmt; int pfmt;
/* Pixel formats, sorted by best first */ /* Pixel formats, sorted by best first */
@ -1724,7 +1724,7 @@ SDL_CreateTextureFromSurface(Uint32 format, SDL_Surface * surface)
} }
} else { } else {
/* Need a format with alpha */ /* Need a format with alpha */
int it; Uint32 it;
int apfmt; int apfmt;
/* Pixel formats with alpha, sorted by best first */ /* Pixel formats with alpha, sorted by best first */

2
src/video/win32/SDL_win32video.h
View file

@ -87,7 +87,7 @@ typedef struct SDL_VideoData
/* *INDENT-ON* */ /* *INDENT-ON* */
int keyboard; int keyboard;
SDL_scancode *key_layout; const SDL_scancode *key_layout;
} SDL_VideoData; } SDL_VideoData;
#endif /* _SDL_win32video_h */ #endif /* _SDL_win32video_h */

2
src/video/win32/SDL_win32window.c
View file

@ -642,6 +642,7 @@ SDL_HelperWindowCreate(void)
{ {
HINSTANCE hInstance = GetModuleHandle(NULL); HINSTANCE hInstance = GetModuleHandle(NULL);
WNDCLASS wce; WNDCLASS wce;
HWND hWndParent = NULL;
/* Make sure window isn't created twice. */ /* Make sure window isn't created twice. */
if (SDL_HelperWindow != NULL) { if (SDL_HelperWindow != NULL) {
@ -662,7 +663,6 @@ SDL_HelperWindowCreate(void)
return -1; return -1;
} }
HWND hWndParent = NULL;
#ifndef _WIN32_WCE #ifndef _WIN32_WCE
/* WinCE doesn't have HWND_MESSAGE */ /* WinCE doesn't have HWND_MESSAGE */
hWndParent = HWND_MESSAGE; hWndParent = HWND_MESSAGE;