diff --git a/FL/gl.h b/FL/gl.h
index e0f49a3c5..53541edc0 100644
--- a/FL/gl.h
+++ b/FL/gl.h
@@ -1,5 +1,5 @@
 //
-// "$Id: gl.h,v 1.6.2.2 2000/06/05 21:20:34 mike Exp $"
+// "$Id: gl.h,v 1.6.2.3 2000/11/28 15:32:07 spitzak Exp $"
 //
 // OpenGL header file for the Fast Light Tool Kit (FLTK).
 //
@@ -34,9 +34,16 @@
 #define gl_draw_H
 
 #include "Enumerations.H" // for color names
-#ifdef WIN32
+#ifdef _WIN32
 # include <windows.h>
 #endif
+#ifndef APIENTRY
+# if defined(__CYGWIN__)
+#  define APIENTRY __attribute__ ((__stdcall__))
+# else
+#  define APIENTRY
+# endif
+#endif
 #include <GL/gl.h>
 
 FL_EXPORT void gl_start();
@@ -69,5 +76,5 @@ FL_EXPORT void gl_draw_image(const uchar *, int x,int y,int w,int h, int d=3, in
 #endif
 
 //
-// End of "$Id: gl.h,v 1.6.2.2 2000/06/05 21:20:34 mike Exp $".
+// End of "$Id: gl.h,v 1.6.2.3 2000/11/28 15:32:07 spitzak Exp $".
 //
diff --git a/FL/glut.H b/FL/glut.H
index fdf71e6ac..9e727d6f6 100644
--- a/FL/glut.H
+++ b/FL/glut.H
@@ -1,5 +1,5 @@
 //
-// "$Id: glut.H,v 1.6.2.5 2000/10/21 20:01:55 spitzak Exp $"
+// "$Id: glut.H,v 1.6.2.6 2000/11/28 15:32:07 spitzak Exp $"
 //
 // GLUT emulation header file for the Fast Light Tool Kit (FLTK).
 //
@@ -428,10 +428,6 @@ FL_EXPORT int glutBitmapWidth(void *font, int character);
 
 extern "C" {
 
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-
 extern APIENTRY int glutExtensionSupported(char *name);
 
 /* Stroke font opaque addresses (use constants instead in source code). */
@@ -476,5 +472,5 @@ extern APIENTRY void glutSolidIcosahedron();
 #endif                  /* __glut_h__ */
 
 //
-// End of "$Id: glut.H,v 1.6.2.5 2000/10/21 20:01:55 spitzak Exp $".
+// End of "$Id: glut.H,v 1.6.2.6 2000/11/28 15:32:07 spitzak Exp $".
 //