diff --git a/FL/x.H b/FL/x.H
index 140eda275..c379af2e8 100644
--- a/FL/x.H
+++ b/FL/x.H
@@ -1,5 +1,5 @@
 //
-// "$Id: x.H,v 1.10.2.3 1999/10/14 04:58:13 bill Exp $"
+// "$Id: x.H,v 1.10.2.4 1999/10/16 19:58:20 bill Exp $"
 //
 // X11 header file for the Fast Light Tool Kit (FLTK).
 //
@@ -39,12 +39,12 @@
 
 #else
 
-#ifdef __sgi
+#if defined(_ABIN32) || defined(_ABI64) // fix for broken SGI Irix X .h files
 #pragma set woff 3322
 #endif
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#ifdef __sgi
+#if defined(_ABIN32) || defined(_ABI64)
 #pragma reset woff 3322
 #endif
 #include <X11/Xatom.h>
@@ -124,5 +124,5 @@ extern FL_EXPORT int fl_background_pixel;  // hack into Fl_X::make_xid()
 #endif
 
 //
-// End of "$Id: x.H,v 1.10.2.3 1999/10/14 04:58:13 bill Exp $".
+// End of "$Id: x.H,v 1.10.2.4 1999/10/16 19:58:20 bill Exp $".
 //
diff --git a/src/fl_draw_pixmap.cxx b/src/fl_draw_pixmap.cxx
index 0fe0d96fe..4d91c9ab7 100644
--- a/src/fl_draw_pixmap.cxx
+++ b/src/fl_draw_pixmap.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_draw_pixmap.cxx,v 1.4.2.3 1999/09/16 05:34:27 bill Exp $"
+// "$Id: fl_draw_pixmap.cxx,v 1.4.2.4 1999/10/16 19:58:21 bill Exp $"
 //
 // Pixmap drawing code for the Fast Light Tool Kit (FLTK).
 //
@@ -137,7 +137,7 @@ uchar **fl_mask_bitmap; // if non-zero, create bitmap and store pointer here
 int fl_draw_pixmap(/*const*/char*const* di, int x, int y, Fl_Color bg) {
   pixmap_data d;
   if (!fl_measure_pixmap(di, d.w, d.h)) return 0;
-  const uchar*const* data = (uchar**)(di+1);
+  const uchar*const* data = (const uchar*const*)(di+1);
   int transparent_index = -1;
 
   if (ncolors < 0) {	// fltk (non standard) compressed colormap
@@ -264,5 +264,5 @@ int fl_draw_pixmap(/*const*/char*const* di, int x, int y, Fl_Color bg) {
 }
 
 //
-// End of "$Id: fl_draw_pixmap.cxx,v 1.4.2.3 1999/09/16 05:34:27 bill Exp $".
+// End of "$Id: fl_draw_pixmap.cxx,v 1.4.2.4 1999/10/16 19:58:21 bill Exp $".
 //
diff --git a/src/glut_compatability.cxx b/src/glut_compatability.cxx
index 33e7144e3..bf05979c9 100755
--- a/src/glut_compatability.cxx
+++ b/src/glut_compatability.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: glut_compatability.cxx,v 1.4.2.1 1999/03/18 20:04:13 bill Exp $"
+// "$Id: glut_compatability.cxx,v 1.4.2.2 1999/10/16 19:58:22 bill Exp $"
 //
 // GLUT emulation routines for the Fast Light Tool Kit (FLTK).
 //
@@ -127,7 +127,7 @@ int Fl_Glut_Window::handle(int event) {
     } else {
       if (special) {
 	int i = Fl::event_key();
-	if (i >= FL_F && i < FL_F_Last) i = i-FL_F+1;
+	if (i > FL_F && i <= FL_F_Last) i = i-FL_F;
 	special(i,ex,ey);
 	return 1;
       }
@@ -399,5 +399,5 @@ int glutLayerGet(GLenum type) {
 #endif
 
 //
-// End of "$Id: glut_compatability.cxx,v 1.4.2.1 1999/03/18 20:04:13 bill Exp $".
+// End of "$Id: glut_compatability.cxx,v 1.4.2.2 1999/10/16 19:58:22 bill Exp $".
 //