From 460d095a9ef54c3edb92e36a6af72f0f34e4fbc3 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Sat, 24 Mar 2018 22:54:16 +0300 Subject: [PATCH] add ifdefs to avoid unnecessary 64bit strtoull() in win32 builds --- src/video/windib/SDL_dibevents.c | 4 +++- src/video/windx5/SDL_dx5events.c | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/video/windib/SDL_dibevents.c b/src/video/windib/SDL_dibevents.c index 6cee54ad2..22c50c8b7 100644 --- a/src/video/windib/SDL_dibevents.c +++ b/src/video/windib/SDL_dibevents.c @@ -654,8 +654,10 @@ int DIB_CreateWindow(_THIS) MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, windowid, -1, windowid_t, SDL_strlen(windowid) + 1); SDL_Window = (HWND)wcstol(windowid_t, NULL, 0); SDL_free(windowid_t); +#elif defined(_WIN64) + SDL_Window = (HWND)SDL_strtoull(windowid, NULL, 0); #else - SDL_Window = (HWND)((size_t)SDL_strtoull(windowid, NULL, 0)); + SDL_Window = (HWND)SDL_strtoul(windowid, NULL, 0); #endif if ( SDL_Window == NULL ) { SDL_SetError("Couldn't get user specified window"); diff --git a/src/video/windx5/SDL_dx5events.c b/src/video/windx5/SDL_dx5events.c index e12092fd6..82c54fa28 100644 --- a/src/video/windx5/SDL_dx5events.c +++ b/src/video/windx5/SDL_dx5events.c @@ -947,7 +947,11 @@ int DX5_CreateWindow(_THIS) SDL_windowid = (windowid != NULL); if ( SDL_windowid ) { - SDL_Window = (HWND)((size_t)SDL_strtoull(windowid, NULL, 0)); + #ifdef _WIN64 + SDL_Window = (HWND)SDL_strtoull(windowid, NULL, 0); + #else + SDL_Window = (HWND)SDL_strtoul(windowid, NULL, 0); + #endif if ( SDL_Window == NULL ) { SDL_SetError("Couldn't get user specified window"); return(-1);