From 4a086a380994f17b266cfb190f913e5a83d4dd0c Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Mon, 5 Apr 2010 19:11:49 +0000
Subject: Fixed max. fd calculation, if USE_POLL is enabled (STR #2324). This
 could maybe be removed completely, but anyway...

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7431 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 CHANGES      | 1 +
 src/Fl_x.cxx | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index ab62388f7..df737ac5f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
 CHANGES IN FLTK 1.3.0
 
+	- Fixed max. fd calculation, if USE_POLL is enabled (STR #2324)
 	- Fixed clipping for offscreen rendering (OSX, STR #2330)
 	- Added printing support (Fl_Printer class and friends) for native
 	  printing on Windows and Mac OS X, PostScript printing on X11
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index c66f71455..aa046d757 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -136,7 +136,9 @@ void Fl::add_fd(int n, void (*cb)(int, void*), void* v) {
 
 void Fl::remove_fd(int n, int events) {
   int i,j;
+# if !USE_POLL
   maxfd = -1; // recalculate maxfd on the fly
+# endif
   for (i=j=0; i<nfds; i++) {
 #  if USE_POLL
     if (pollfds[i].fd == n) {
@@ -150,8 +152,8 @@ void Fl::remove_fd(int n, int events) {
       if (!e) continue; // if no events left, delete this fd
       fd[i].events = e;
     }
-#  endif
     if (fd[i].fd > maxfd) maxfd = fd[i].fd;
+#  endif
     // move it down in the array if necessary:
     if (j<i) {
       fd[j] = fd[i];
-- 
cgit v1.2.3