summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
authorBill Spitzak <spitzak@gmail.com>1999-10-16 19:58:22 +0000
committerBill Spitzak <spitzak@gmail.com>1999-10-16 19:58:22 +0000
commit2e58f174f70543d4e8da74c5f04371fd06f051b2 (patch)
tree1bedefc00c15ef93f0e44eb23cf8294dbfc57910 /FL
parenta7904da09a890a8b6b2bbfc11a4a32308dc82023 (diff)
Changed the sgi -woff pragma to the new #define suggested by Michael Sweet.
Cast in draw_pixmap that produced an error in the OSF1 compiler fixed. Error in emulation of GLUT_KEY_F?() git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@779 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
-rw-r--r--FL/x.H8
1 files changed, 4 insertions, 4 deletions
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 $".
//