summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2006-08-30 09:18:12 +0000
committerMatthias Melcher <fltk@matthiasm.com>2006-08-30 09:18:12 +0000
commit3303d9d7f5134659400c4b4dd5bae16435c56857 (patch)
tree28e3562ce5f58d65c55563947570325fa50f1dc4
parent40846ea88768f2be5b7c5145959e4ac389520a7f (diff)
STR #1151: Cygwin for some reason was ifdef'd out for setting a shorter timout when reading fd's (yes, the Win32 requires polling to read fd's). Adding the shorter timeout has no impact on Apps that do not poll fd's, but should fix most (all?) problems described in this bug report.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5383 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--CHANGES1
-rw-r--r--src/Fl_win32.cxx4
2 files changed, 1 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 2706c10e5..1649accbb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
CHANGES IN FLTK 1.1.8
+ - Fixed Cygwin timeout for "select" calls (STR #1151)
- Improved Mac OS X subwindow handling (STR #1402)
- Fixed more inconsistencies between fl_draw
and fl_measure (STR #1408)
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index 070967d5b..e1a9dd5ea 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -247,14 +247,10 @@ int fl_wait(double time_to_wait) {
if (fd[i].events & revents) fd[i].cb(f, fd[i].arg);
}
time_to_wait = 0.0; // just peek for any messages
-#ifdef __CYGWIN__
- }
-#else
} else {
// we need to check them periodically, so set a short timeout:
if (time_to_wait > .001) time_to_wait = .001;
}
-#endif
}
#endif // USE_ASYNC_SELECT