summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Ercolano <erco@seriss.com>2010-10-01 00:30:08 +0000
committerGreg Ercolano <erco@seriss.com>2010-10-01 00:30:08 +0000
commitbc224390ea7718d09bd298747aa9ec0b3f1fbadf (patch)
treee218816bf545f3b6f06ed391e91912112e998c76
parentb15ececeb6bc1b34996343e6839923f05ee5e0b2 (diff)
Small mods to allow SGI builds.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7708 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--FL/filename.H5
-rw-r--r--src/Fl_Paged_Device.cxx3
2 files changed, 5 insertions, 3 deletions
diff --git a/FL/filename.H b/FL/filename.H
index 29d0bcf91..9f4d9ab0f 100644
--- a/FL/filename.H
+++ b/FL/filename.H
@@ -25,8 +25,9 @@
* http://www.fltk.org/str.php
*/
-// Xcode on OS X includes files by recursing down into directories.
-// This code catches the cycle and directly includes the required file.
+/* Xcode on OS X includes files by recursing down into directories.
+ * This code catches the cycle and directly includes the required file.
+ */
#ifdef fl_dirent_h_cyclic_include
# include "/usr/include/dirent.h"
#endif
diff --git a/src/Fl_Paged_Device.cxx b/src/Fl_Paged_Device.cxx
index d65f7983b..0af786dd9 100644
--- a/src/Fl_Paged_Device.cxx
+++ b/src/Fl_Paged_Device.cxx
@@ -149,7 +149,8 @@ void Fl_Paged_Device::print_window_part(Fl_Window *win, int x, int y, int w, int
}
save_front->show();
current->set_current();
- for ( int i = 0, offset = 0; i < count; i++, offset += slice) {
+ offset = 0;
+ for ( int i = 0; i < count; i++, offset += slice) {
width = slice;
if (offset + width > w) width = w - offset;
fl_draw_image(image_data[i], delta_x + offset, delta_y, width, h, 3);