summaryrefslogtreecommitdiff
path: root/FL/Fl_Bitmap.H
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2003-01-15 19:41:58 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2003-01-15 19:41:58 +0000
commit4fb89e2571c12273e68b1624e2b110049dcaab12 (patch)
tree4d6d1bc5002a48070f5e2371fbd70e8da4b5420f /FL/Fl_Bitmap.H
parente695187237e0ce9f2ec366599764819b8ae61315 (diff)
Fix build problems on Windows.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2913 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/Fl_Bitmap.H')
-rw-r--r--FL/Fl_Bitmap.H8
1 files changed, 4 insertions, 4 deletions
diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H
index 854edf375..30413d61f 100644
--- a/FL/Fl_Bitmap.H
+++ b/FL/Fl_Bitmap.H
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Bitmap.H,v 1.5.2.3.2.9 2003/01/10 19:29:07 easysw Exp $"
+// "$Id: Fl_Bitmap.H,v 1.5.2.3.2.10 2003/01/15 19:41:58 easysw Exp $"
//
// Bitmap header file for the Fast Light Tool Kit (FLTK).
//
@@ -35,11 +35,11 @@ class FL_EXPORT Fl_Bitmap : public Fl_Image {
const uchar *array;
int alloc_array; // Non-zero if data was allocated
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(WIN32)
void *id; // for internal use
#else
unsigned id; // for internal use
-#endif // __APPLE__
+#endif // __APPLE__ || WIN32
Fl_Bitmap(const uchar *bits, int W, int H) :
Fl_Image(W,H,0), array(bits), alloc_array(0), id(0) {data((const char **)&array, 1);}
@@ -58,5 +58,5 @@ class FL_EXPORT Fl_Bitmap : public Fl_Image {
#endif
//
-// End of "$Id: Fl_Bitmap.H,v 1.5.2.3.2.9 2003/01/10 19:29:07 easysw Exp $".
+// End of "$Id: Fl_Bitmap.H,v 1.5.2.3.2.10 2003/01/15 19:41:58 easysw Exp $".
//