[poe-commits] poe/POE/Wheel ListenAccept.pm,1.27,1.28 SocketFactory.pm,1.73,1.74

[<rc...@us...>]

Update of /cvsroot/poe/poe/POE/Wheel
In directory sc8-pr-cvs1:/tmp/cvs-serv6579/POE/Wheel

Modified Files:
	ListenAccept.pm SocketFactory.pm 
Log Message:
Replace POSIX errno constants with ones from Errno.  The Errno module
has better errno support than POSIX in "special" environments like
ActivePerl.  This commit addresses rt.cpan.org ticket #4476.


Index: ListenAccept.pm
===================================================================
RCS file: /cvsroot/poe/poe/POE/Wheel/ListenAccept.pm,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ListenAccept.pm	21 Nov 2003 05:08:26 -0000	1.27
--- ListenAccept.pm	26 Nov 2003 03:52:07 -0000	1.28
***************
*** 11,15 ****
  use Symbol;
  
! use POSIX qw(fcntl_h errno_h);
  use POE qw(Wheel);
  
--- 11,16 ----
  use Symbol;
  
! use POSIX qw(fcntl_h);
! use Errno qw(EWOULDBLOCK);
  use POE qw(Wheel);
  

Index: SocketFactory.pm
===================================================================
RCS file: /cvsroot/poe/poe/POE/Wheel/SocketFactory.pm,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** SocketFactory.pm	21 Nov 2003 05:08:26 -0000	1.73
--- SocketFactory.pm	26 Nov 2003 03:52:07 -0000	1.74
***************
*** 12,16 ****
  use Symbol;
  
! use POSIX qw(fcntl_h errno_h);
  use Socket;
  use POE qw(Wheel);
--- 12,17 ----
  use Symbol;
  
! use POSIX qw(fcntl_h);
! use Errno qw(EWOULDBLOCK EADDRNOTAVAIL EINPROGRESS EADDRINUSE);
  use Socket;
  use POE qw(Wheel);
***************
*** 38,44 ****
  # know you've broken his module.
  
! # Provide dummy POSIX constants for systems that don't have them.  Use
! # http://msdn.microsoft.com/library/en-us/winsock/winsock/
! #   windows_sockets_error_codes_2.asp for the POSIX error numbers.
  BEGIN {
    if ($^O eq 'MSWin32') {
--- 39,43 ----
  # know you've broken his module.
  
! # Provide dummy constants for systems that don't have them.
  BEGIN {
    if ($^O eq 'MSWin32') {
***************
*** 46,53 ****
      # Constants are evaluated first so they exist when the code uses
      # them.
!     eval( '*EADDRNOTAVAIL = sub { 10049 };' .
!           '*EINPROGRESS   = sub { 10036 };' .
!           '*EWOULDBLOCK   = sub { 10035 };' .
!           '*F_GETFL       = sub {     0 };' .
            '*F_SETFL       = sub {     0 };' .
  
--- 45,49 ----
      # Constants are evaluated first so they exist when the code uses
      # them.
!     eval( '*F_GETFL       = sub {     0 };' .
            '*F_SETFL       = sub {     0 };' .
  
***************
*** 947,954 ****
    if (defined $connect_address) {
      unless (connect($socket_handle, $connect_address)) {
- 
-       # XXX EINPROGRESS is not included in ActiveState's POSIX.pm, and
-       # I don't know what AS's Perl uses instead.  What to do here?
- 
        if ($! and ($! != EINPROGRESS) and ($! != EWOULDBLOCK)) {
          $poe_kernel->yield( $event_failure,
--- 943,946 ----