pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug #215

Browse source 
The current SVN trunk is missing the SDLCALL specifier at numerous locations.

It has to be added for all (possibly user provided) callbacks.

I stumbled over this while creating a makefile for the OpenWatcom compiler for
Win32.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401728
This commit is contained in:
Sam Lantinga 2006-05-07 03:40:06 +00:00
parent cab8a203a7
commit b4ba6518d6
19 changed files with 85 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/win32/SDL_win32_main.c
View file

@ -121,8 +121,15 @@ static BOOL OutOfMemory(void)
return FALSE;
}
/* SDL_Quit() shouldn't be used with atexit() directly because
calling conventions may differ... */
static void cleanup(void)
{
SDL_Quit();
}
/* Remove the output files if there was no output written */
static void __cdecl cleanup_output(void)
static void cleanup_output(void)
{
#ifndef NO_STDIO_REDIRECT
FILE *file;
@ -188,7 +195,7 @@ int console_main(int argc, char *argv[])
if ( bufp == NULL ) {
return OutOfMemory();
}
SDL_strlcpy(bufp, appname, n);
SDL_strlcpy(bufp, appname, n+1);
appname = bufp;
/* Load SDL dynamic link library */
@ -197,7 +204,7 @@ int console_main(int argc, char *argv[])
return(FALSE);
}
atexit(cleanup_output);
atexit(SDL_Quit);
atexit(cleanup);
/* Sam:
We still need to pass in the application handle so that