From e95d56f19bb833d5acf6e048b11fb5e31fc19b38 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Tue, 24 Apr 2001 19:35:38 +0000
Subject: [PATCH] Update to cover both SGI C++ and GCC 2.8.x.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1439 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
FL/Fl_Pixmap.H | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H
index 6996cf4d7..b4f4468b2 100644
--- a/FL/Fl_Pixmap.H
+++ b/FL/Fl_Pixmap.H
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Pixmap.H,v 1.6.2.5 2001/04/23 20:52:52 easysw Exp $"
+// "$Id: Fl_Pixmap.H,v 1.6.2.6 2001/04/24 19:35:38 easysw Exp $"
//
// Pixmap header file for the Fast Light Tool Kit (FLTK).
//
@@ -34,10 +34,10 @@ struct Fl_Pixmap {
int w, h; // set by first draw...
ulong id; // for internal use (the pixmap)
ulong mask; // for internal use (mask bitmap)
-#ifdef __sgi
+#if defined(__sgi) || (__GNUC__ == 2 && __GNUC_MINOR__ == 8)
Fl_Pixmap(char * const * d) : data((const char*const*)d), w(-1), h(0), id(0),mask(0) {}
Fl_Pixmap(uchar* const * d) : data((const char*const*)d), w(-1), h(0), id(0),mask(0) {}
-#endif /* __sgi */
+#endif /* __sgi || GCC 2.8.x */
Fl_Pixmap(const char * const * d) : data(d), w(-1), h(0), id(0),mask(0) {}
Fl_Pixmap(const uchar* const * d) : data((const char*const*)d), w(-1), h(0), id(0),mask(0) {}
FL_EXPORT ~Fl_Pixmap();
@@ -50,5 +50,5 @@ struct Fl_Pixmap {
#endif
//
-// End of "$Id: Fl_Pixmap.H,v 1.6.2.5 2001/04/23 20:52:52 easysw Exp $".
+// End of "$Id: Fl_Pixmap.H,v 1.6.2.6 2001/04/24 19:35:38 easysw Exp $".
//
--
GitLab