FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable the ATEXIT_HACK for Watcom, their "exit" function has a different

Browse Source 
calling convention, leading to compilation errors.


git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@826 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
spanne 2009-06-11 08:25:25 +00:00
parent a5f5c71bac
commit 22ea7171fe
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freeglut/freeglut/ChangeLog
View File

@ -1,3 +1,9 @@
2009-06-11 Sven Panne <sven.panne@aedion.de>
* include/GL/freeglut_std.h: Disable the ATEXIT_HACK for Watcom, their
"exit" function has a different calling convention, leading to
compilation errors.
2009-05-24 Sven Panne <sven.panne@aedion.de> 2009-05-24 Sven Panne <sven.panne@aedion.de>
* freeglut_static_vs2008.vcproj,freeglut_vs2008.vcproj, * freeglut_static_vs2008.vcproj,freeglut_vs2008.vcproj,

2
freeglut/freeglut/include/GL/freeglut_std.h
View File

@ -599,7 +599,7 @@ FGAPI void FGAPIENTRY glutReportErrors( void );
/* to get the prototype for exit() */ /* to get the prototype for exit() */
#include <stdlib.h> #include <stdlib.h>
#if defined(_WIN32) && !defined(GLUT_DISABLE_ATEXIT_HACK) #if defined(_WIN32) && !defined(GLUT_DISABLE_ATEXIT_HACK) && !defined(__WATCOMC__)
FGAPI void FGAPIENTRY __glutInitWithExit(int *argcp, char **argv, void (__cdecl *exitfunc)(int)); FGAPI void FGAPIENTRY __glutInitWithExit(int *argcp, char **argv, void (__cdecl *exitfunc)(int));
FGAPI int FGAPIENTRY __glutCreateWindowWithExit(const char *title, void (__cdecl *exitfunc)(int)); FGAPI int FGAPIENTRY __glutCreateWindowWithExit(const char *title, void (__cdecl *exitfunc)(int));
FGAPI int FGAPIENTRY __glutCreateMenuWithExit(void (* func)(int), void (__cdecl *exitfunc)(int)); FGAPI int FGAPIENTRY __glutCreateMenuWithExit(void (* func)(int), void (__cdecl *exitfunc)(int));