--- cvsroot/EV/schmorp.h	2009/07/18 00:59:45	1.6
+++ cvsroot/EV/schmorp.h	2010/04/14 00:17:22	1.8
@@ -22,6 +22,10 @@
        && (PERL_VERSION > (b)					\
            || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
 
+#ifndef PERL_MAGIC_ext
+# define PERL_MAGIC_ext '~'
+#endif
+
 #if !PERL_VERSION_ATLEAST (5,6,0)
 # ifndef PL_ppaddr
 #  define PL_ppaddr ppaddr
@@ -442,8 +446,10 @@
       if (dup2 (epn.fd [0], epp->fd [0]) < 0)
         croak ("unable to dup over old event pipe"); /* should not croak */
 
-      if (epp->fd [1] != epp->fd [0])
-        close (epn.fd [0]);
+      close (epn.fd [0]);
+
+      if (epn.fd [0] == epn.fd [1])
+        epn.fd [1] = epp->fd [0];
 
       epn.fd [0] = epp->fd [0];
     }
@@ -474,7 +480,7 @@
   pfd.fd = s_epipe_fd (epp);
   pfd.events = POLLIN;
 
-  return poll (&pfd, 1, 0);
+  return poll (&pfd, 1, -1);
 #endif
 }