eden-emu/SDL
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Fixed warning C4245: 'return': conversion from 'int' to 'SDL_TimerID', signed/unsigned mismatch

Browse source
This commit is contained in:
Sam Lantinga 2024-02-03 11:08:52 -08:00
parent 4514aabb41
commit 62221b3003
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/test/SDL_test_harness.c
View file

@ -183,19 +183,19 @@ static SDL_TimerID SDLTest_SetTestTimeout(int timeout, void(SDLCALL *callback)(v
if (!callback) { if (!callback) {
SDLTest_LogError("Timeout callback can't be NULL"); SDLTest_LogError("Timeout callback can't be NULL");
return -1; return 0;
} }
if (timeout < 0) { if (timeout < 0) {
SDLTest_LogError("Timeout value must be bigger than zero."); SDLTest_LogError("Timeout value must be bigger than zero.");
return -1; return 0;
} }
/* Init SDL timer if not initialized before */ /* Init SDL timer if not initialized before */
if (SDL_WasInit(SDL_INIT_TIMER) == 0) { if (SDL_WasInit(SDL_INIT_TIMER) == 0) {
if (SDL_InitSubSystem(SDL_INIT_TIMER)) { if (SDL_InitSubSystem(SDL_INIT_TIMER)) {
SDLTest_LogError("Failed to init timer subsystem: %s", SDL_GetError()); SDLTest_LogError("Failed to init timer subsystem: %s", SDL_GetError());
return -1; return 0;
} }
} }
@ -204,7 +204,7 @@ static SDL_TimerID SDLTest_SetTestTimeout(int timeout, void(SDLCALL *callback)(v
timerID = SDL_AddTimer(timeoutInMilliseconds, (SDL_TimerCallback)callback, 0x0); timerID = SDL_AddTimer(timeoutInMilliseconds, (SDL_TimerCallback)callback, 0x0);
if (timerID == 0) { if (timerID == 0) {
SDLTest_LogError("Creation of SDL timer failed: %s", SDL_GetError()); SDLTest_LogError("Creation of SDL timer failed: %s", SDL_GetError());
return -1; return 0;
} }
return timerID; return timerID;