Mercurial > sdl-ios-xcode
diff test/testlock.c @ 1151:be9c9c8f6d53
Removed atexit() from most of the test programs; atexit(SDL_Quit) isn't safe
if SDL is built with a non-cdecl calling convention, and it's just generally
bad practice anyhow.
Now programs explicitly call SDL_Quit() where appropriate, wrap SDL_Quit() in
a cdecl function where it can't be avoided, and rely on the parachute where
a crash might have hit the atexit() before (these ARE test programs, after
all!).
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Wed, 28 Sep 2005 11:36:20 +0000 |
| parents | 74212992fb08 |
| children | 14717b52abc0 |
line wrap: on
line diff
--- a/test/testlock.c Wed Sep 28 06:38:22 2005 +0000 +++ b/test/testlock.c Wed Sep 28 11:36:20 2005 +0000 @@ -15,6 +15,15 @@ static Uint32 mainthread; static SDL_Thread *threads[6]; +/* + * SDL_Quit() shouldn't be used with atexit() directly because + * calling conventions may differ... + */ +static void SDL_Quit_Wrapper(void) +{ + SDL_Quit(); +} + void printid(void) { printf("Process %u: exiting\n", SDL_ThreadID()); @@ -68,7 +77,7 @@ fprintf(stderr, "%s\n", SDL_GetError()); exit(1); } - atexit(SDL_Quit); + atexit(SDL_Quit_Wrapper); if ( (mutex=SDL_CreateMutex()) == NULL ) { fprintf(stderr, "Couldn't create mutex: %s\n", SDL_GetError());