--- rxvt-unicode/src/iom.C	2004/12/11 17:18:29	1.24
+++ rxvt-unicode/src/iom.C	2004/12/20 16:44:31	1.27
@@ -35,7 +35,7 @@
 
 // for IOM_SIG
 #if IOM_SIG
-# include <signal.h>
+# include <csignal>
 # include <fcntl.h>
 #endif
 
@@ -125,8 +125,8 @@
         abort ();
       }
 
-    fcntl (sigpipe[0], F_SETFL, O_NONBLOCK);
-    fcntl (sigpipe[1], F_SETFL, O_NONBLOCK);
+    fcntl (sigpipe[0], F_SETFL, O_NONBLOCK); fcntl (sigpipe[0], F_SETFD, FD_CLOEXEC);
+    fcntl (sigpipe[1], F_SETFL, O_NONBLOCK); fcntl (sigpipe[1], F_SETFD, FD_CLOEXEC);
 #endif
 
     iom_valid = true;
@@ -416,13 +416,14 @@
               iow.erase_unordered (i);
             else
               {
-                short revents = iow[i]->events;
+                io_watcher &w = *iow[i];
+                short revents = w.events;
 
-                if (!FD_ISSET (iow[i]->fd, &rfd)) revents &= ~EVENT_READ;
-                if (!FD_ISSET (iow[i]->fd, &wfd)) revents &= ~EVENT_WRITE;
+                if (!FD_ISSET (w.fd, &rfd)) revents &= ~EVENT_READ;
+                if (!FD_ISSET (w.fd, &wfd)) revents &= ~EVENT_WRITE;
 
                 if (revents)
-                  iow[i]->call (*iow[i], revents);
+                  w.call (w, revents);
               }
 #endif
         }