encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed some warnings building for 64-bit Windows

This commit is contained in:
Sam Lantinga 2013-10-21 01:16:16 -07:00
parent 11d38d696e
commit b8b9bfbe5b
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/joystick/SDL_gamecontroller.c
View File

@ -758,7 +758,7 @@ SDL_GameControllerLoadHints()
{ {
const char *hint = SDL_GetHint(SDL_HINT_GAMECONTROLLERCONFIG); const char *hint = SDL_GetHint(SDL_HINT_GAMECONTROLLERCONFIG);
if ( hint && hint[0] ) { if ( hint && hint[0] ) {
int nchHints = SDL_strlen( hint ); size_t nchHints = SDL_strlen( hint );
char *pUserMappings = SDL_malloc( nchHints + 1 ); char *pUserMappings = SDL_malloc( nchHints + 1 );
char *pTempMappings = pUserMappings; char *pTempMappings = pUserMappings;
SDL_memcpy( pUserMappings, hint, nchHints ); SDL_memcpy( pUserMappings, hint, nchHints );

2
src/joystick/SDL_joystick.c
View File

@ -830,7 +830,7 @@ SDL_JoystickGUID SDL_JoystickGetGUIDFromString(const char *pchGUID)
{ {
SDL_JoystickGUID guid; SDL_JoystickGUID guid;
int maxoutputbytes= sizeof(guid); int maxoutputbytes= sizeof(guid);
int len = SDL_strlen( pchGUID ); size_t len = SDL_strlen( pchGUID );
Uint8 *p; Uint8 *p;
int i; int i;

4
src/video/windows/SDL_windowskeyboard.c
View File

@ -758,10 +758,10 @@ IME_GetCandidateList(HIMC himc, SDL_VideoData *videodata)
if (LANG() == LANG_CHS && IME_GetId(videodata, 0)) { if (LANG() == LANG_CHS && IME_GetId(videodata, 0)) {
const UINT maxcandchar = 18; const UINT maxcandchar = 18;
UINT i = 0; UINT i = 0;
UINT cchars = 0; size_t cchars = 0;
for (; i < videodata->ime_candcount; ++i) { for (; i < videodata->ime_candcount; ++i) {
UINT len = SDL_wcslen((LPWSTR)((DWORD_PTR)cand_list + cand_list->dwOffset[i])) + 1; size_t len = SDL_wcslen((LPWSTR)((DWORD_PTR)cand_list + cand_list->dwOffset[i])) + 1;
if (len + cchars > maxcandchar) { if (len + cchars > maxcandchar) {
if (i > cand_list->dwSelection) if (i > cand_list->dwSelection)
break; break;

3
src/video/windows/SDL_windowsmessagebox.c
View File

@ -342,7 +342,8 @@ int
WIN_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid) WIN_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
{ {
WIN_DialogData *dialog; WIN_DialogData *dialog;
int i, x, y, which; int i, x, y;
UINT_PTR which;
const SDL_MessageBoxButtonData *buttons = messageboxdata->buttons; const SDL_MessageBoxButtonData *buttons = messageboxdata->buttons;
HFONT DialogFont; HFONT DialogFont;
SIZE Size; SIZE Size;