From 421fd3985fa044d05ba50c33307bcaae2a18f5fc Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 21 Dec 2000 18:15:14 +0000
Subject: [PATCH] Fix to allow Fl.cxx to compile with older C++ compilers (no
variable declaration in while() constructs...)
"cp" doesn't always support "-f".
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1350 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
documentation/Makefile | 8 ++++----
src/Fl.cxx | 7 ++++---
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/documentation/Makefile b/documentation/Makefile
index 346c1f1a4..c91c7c641 100644
--- a/documentation/Makefile
+++ b/documentation/Makefile
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile,v 1.9.2.6 2000/06/05 21:20:35 mike Exp $"
+# "$Id: Makefile,v 1.9.2.7 2000/12/21 18:15:14 easysw Exp $"
#
# Documentation makefile for the Fast Light Tool Kit (FLTK).
#
@@ -129,8 +129,8 @@ depend:
install:
-mkdir -p $(prefix)/share/doc/fltk
- cp -f $(HTMLFILES) index.html $(prefix)/share/doc/fltk
- cp -f *.gif *.jpg $(prefix)/share/doc/fltk
+ cp $(HTMLFILES) index.html $(prefix)/share/doc/fltk
+ cp *.gif *.jpg $(prefix)/share/doc/fltk
chmod 644 $(prefix)/share/doc/fltk/*
fltk.d/index.html: $(HTMLFILES)
@@ -149,5 +149,5 @@ fltk.pdf: $(HTMLFILES)
$(HTMLDOC) -f fltk.pdf --jpeg --compression=9 --duplex --verbose --toclevels 2 --titleimage FL.gif $(HTMLFILES)
#
-# End of "$Id: Makefile,v 1.9.2.6 2000/06/05 21:20:35 mike Exp $".
+# End of "$Id: Makefile,v 1.9.2.7 2000/12/21 18:15:14 easysw Exp $".
#
diff --git a/src/Fl.cxx b/src/Fl.cxx
index 1fc52303a..56f25894b 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl.cxx,v 1.24.2.35 2000/12/12 08:57:30 spitzak Exp $"
+// "$Id: Fl.cxx,v 1.24.2.36 2000/12/21 18:15:14 easysw Exp $"
//
// Main event handling code for the Fast Light Tool Kit (FLTK).
//
@@ -203,7 +203,8 @@ static char in_idle;
double Fl::wait(double time_to_wait) {
if (first_timeout) {
elapse_timeouts();
- while (Timeout* t = first_timeout) {
+ Timeout *t;
+ while (t = first_timeout) {
if (t->time > 0) break;
// The first timeout in the array has expired.
// We must remove timeout from array before doing the callback:
@@ -771,5 +772,5 @@ void Fl_Window::flush() {
}
//
-// End of "$Id: Fl.cxx,v 1.24.2.35 2000/12/12 08:57:30 spitzak Exp $".
+// End of "$Id: Fl.cxx,v 1.24.2.36 2000/12/21 18:15:14 easysw Exp $".
//
--
GitLab