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

use the 'aborts' pragma of Watcom for SDL_NORETURN functions 

SDL_ExitProcess(), SDL_AbortAssertion() and SDLTest_BailOut().

(Commit 303c1e0fb0cf for bug #4100 removed SDL_NORETURN from
SDL_ExitProcess() and SDL_AbortAssertion() in order to avoid
warnings from windows builds, but that's temporary I guess..)
This commit is contained in:
Ozkan Sezer 2018-06-13 14:45:02 +03:00
parent 4a4bac95eb
commit 08de74ec49
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SDL_assert.c
View File

@ -120,6 +120,9 @@ static void SDL_GenerateAssertionReport(void)
} }
#if defined(__WATCOMC__)
#pragma aux SDL_ExitProcess aborts;
#endif
static void SDL_ExitProcess(int exitcode) static void SDL_ExitProcess(int exitcode)
{ {
#ifdef __WIN32__ #ifdef __WIN32__
@ -138,6 +141,9 @@ static void SDL_ExitProcess(int exitcode)
} }
#if defined(__WATCOMC__)
#pragma aux SDL_AbortAssertion aborts;
#endif
static void SDL_AbortAssertion(void) static void SDL_AbortAssertion(void)
{ {
SDL_Quit(); SDL_Quit();

3
src/test/SDL_test_harness.c
View File

@ -206,6 +206,9 @@ SDLTest_SetTestTimeout(int timeout, void (*callback)())
/** /**
* \brief Timeout handler. Aborts test run and exits harness process. * \brief Timeout handler. Aborts test run and exits harness process.
*/ */
#if defined(__WATCOMC__)
#pragma aux SDLTest_BailOut aborts;
#endif
static SDL_NORETURN void static SDL_NORETURN void
SDLTest_BailOut() SDLTest_BailOut()
{ {