Skip to content

Commit

Permalink
use the 'aborts' pragma of Watcom for SDL_NORETURN functions
Browse files Browse the repository at this point in the history
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..)
  • Loading branch information
sezero committed Jun 13, 2018
1 parent 4a4bac9 commit 08de74e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/SDL_assert.c
Expand Up @@ -120,6 +120,9 @@ static void SDL_GenerateAssertionReport(void)
}


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


#if defined(__WATCOMC__)
#pragma aux SDL_AbortAssertion aborts;
#endif
static void SDL_AbortAssertion(void)
{
SDL_Quit();
Expand Down
3 changes: 3 additions & 0 deletions src/test/SDL_test_harness.c
Expand Up @@ -206,6 +206,9 @@ SDLTest_SetTestTimeout(int timeout, void (*callback)())
/**
* \brief Timeout handler. Aborts test run and exits harness process.
*/
#if defined(__WATCOMC__)
#pragma aux SDLTest_BailOut aborts;
#endif
static SDL_NORETURN void
SDLTest_BailOut()
{
Expand Down

0 comments on commit 08de74e

Please sign in to comment.