X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut_std.h;h=da18176bb5a64e761432f24062f2b1b610331695;hb=e9ebb8053106d2504605c70a1fd777a52f1d9da4;hp=768157f82264aaf0ae9ae4fcd179ea33a6a9b2c2;hpb=b1857eba8932ff5da6c7bf01fac8da8ebf3687c1;p=freeglut

diff --git a/include/GL/freeglut_std.h b/include/GL/freeglut_std.h
index 768157f..da18176 100644
--- a/include/GL/freeglut_std.h
+++ b/include/GL/freeglut_std.h
@@ -171,8 +171,6 @@
 #define  GLUT_MULTISAMPLE                   0x0080
 #define  GLUT_STEREO                        0x0100
 #define  GLUT_LUMINANCE                     0x0200
-#define  GLUT_CAPTIONLESS                   0x0400
-#define  GLUT_BORDERLESS                    0x0800
 
 /*
  * GLUT API macro definitions -- windows and menu related definitions
@@ -599,7 +597,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));