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

calling convention, leading to compilation errors.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@826 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/ChangeLog b/ChangeLog
index 4da606b..8289609 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * freeglut_static_vs2008.vcproj,freeglut_vs2008.vcproj,

diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h
index 768157f..806d053 100644 (file)
--- a/include/GL/freeglut_std.h
+++ b/include/GL/freeglut_std.h
@@ -599,7 +599,7 @@ FGAPI void    FGAPIENTRY glutReportErrors( void );
 /* to get the prototype for exit() */
 #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 int FGAPIENTRY __glutCreateWindowWithExit(const char *title, void (__cdecl *exitfunc)(int));
 FGAPI int FGAPIENTRY __glutCreateMenuWithExit(void (* func)(int), void (__cdecl *exitfunc)(int));