From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Wed, 23 Feb 2000 18:02:39 +0000 (+0000)
Subject: Remove &IO::EINPROGRESS now that IO uses Errno anyway
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=af66385903edd5f9eaeeae68399b75c770de2f43;p=p5sagit%2Fp5-mst-13.2.git

Remove &IO::EINPROGRESS now that IO uses Errno anyway
(suggested by Graham Barr).

p4raw-id: //depot/cfgperl@5222
---

diff --git a/ext/IO/IO.xs b/ext/IO/IO.xs
index be84f73..4a93c03 100644
--- a/ext/IO/IO.xs
+++ b/ext/IO/IO.xs
@@ -462,7 +462,4 @@ BOOT:
      * constant subs for IO
      */
     stash = gv_stashpvn("IO", 2, TRUE);
-#ifdef EINPROGRESS
-        newCONSTSUB(stash,"EINPROGRESS", newSViv(EINPROGRESS));
-#endif
 }
diff --git a/ext/IO/lib/IO/Socket.pm b/ext/IO/lib/IO/Socket.pm
index 2981516..2b51dee 100644
--- a/ext/IO/lib/IO/Socket.pm
+++ b/ext/IO/lib/IO/Socket.pm
@@ -106,7 +106,7 @@ sub connect {
     $blocking = $sock->blocking(0) if $timeout;
 
     if (!connect($sock, $addr)) {
-	if ($timeout && exists &IO::EINPROGRESS && ($! == &IO::EINPROGRESS)) {
+	if ($timeout && $!{EINPROGRESS}) {
 	    require IO::Select;
 
 	    my $sel = new IO::Select $sock;
@@ -116,10 +116,8 @@ sub connect {
 		$@ = "connect: timeout";
 	    }
 	    elsif(!connect($sock,$addr) && not $!{EISCONN}) {
-		# Some systems (e.g. Digital UNIX/Tru64) fail to
-		# re-connect() to an already open socket and set
-		# errno to EISCONN (Socket is already connected)
-		# for such an attempt.
+		# Some systems refuse to re-connect() to
+		# an already open socket and set errno to EISCONN.
 		$err = $!;
 		$@ = "connect: $!";
 	    }