X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FSocket%2FSocket.pm;h=90e16e6e1962ecf16dd0550dcab18a42d050da1e;hb=b2f54bf351d16099b31b403d421e8b26b2963c35;hp=f83cb18399d6924299bda432010ce655f371c787;hpb=ca6e1c26e8ac218f83b0cec7616cb26dab979947;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/Socket/Socket.pm b/ext/Socket/Socket.pm
index f83cb18..90e16e6 100644
--- a/ext/Socket/Socket.pm
+++ b/ext/Socket/Socket.pm
@@ -1,7 +1,7 @@
 package Socket;
 
 our($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
-$VERSION = "1.71";
+$VERSION = "1.72";
 
 =head1 NAME
 
@@ -111,7 +111,7 @@ to inet_aton('255.255.255.255').
 
 =item sockaddr_in SOCKADDR_IN
 
-In an array context, unpacks its SOCKADDR_IN argument and returns an array
+In a list context, unpacks its SOCKADDR_IN argument and returns an array
 consisting of (PORT, ADDRESS).  In a scalar context, packs its (PORT,
 ADDRESS) arguments as a SOCKADDR_IN and returns it.  If this is confusing,
 use pack_sockaddr_in() and unpack_sockaddr_in() explicitly.
@@ -135,7 +135,7 @@ Will croak if the structure does not have AF_INET in the right place.
 
 =item sockaddr_un SOCKADDR_UN
 
-In an array context, unpacks its SOCKADDR_UN argument and returns an array
+In a list context, unpacks its SOCKADDR_UN argument and returns an array
 consisting of (PATHNAME).  In a scalar context, packs its PATHNAME
 arguments as a SOCKADDR_UN and returns it.  If this is confusing, use
 pack_sockaddr_un() and unpack_sockaddr_un() explicitly.
@@ -160,6 +160,7 @@ have AF_UNIX in the right place.
 =cut
 
 use Carp;
+use warnings::register;
 
 require Exporter;
 use XSLoader ();
@@ -267,6 +268,7 @@ use XSLoader ();
 	SO_RCVLOWAT
 	SO_RCVTIMEO
 	SO_REUSEADDR
+	SO_REUSEPORT
 	SO_SNDBUF
 	SO_SNDLOWAT
 	SO_SNDTIMEO
@@ -302,7 +304,8 @@ BEGIN {
 sub sockaddr_in {
     if (@_ == 6 && !wantarray) { # perl5.001m compat; use this && die
 	my($af, $port, @quad) = @_;
-	carp "6-ARG sockaddr_in call is deprecated" if $^W;
+	warnings::warn "6-ARG sockaddr_in call is deprecated" 
+	    if warnings::enabled();
 	pack_sockaddr_in($port, inet_aton(join('.', @quad)));
     } elsif (wantarray) {
 	croak "usage:   (port,iaddr) = sockaddr_in(sin_sv)" unless @_ == 1;
@@ -323,116 +326,6 @@ sub sockaddr_un {
     }
 }
 
-sub INADDR_ANY 		();
-sub INADDR_BROADCAST	();
-sub INADDR_LOOPBACK	();
-sub INADDR_LOOPBACK	();
-
-sub AF_802		();
-sub AF_APPLETALK	();
-sub AF_CCITT		();
-sub AF_CHAOS		();
-sub AF_DATAKIT		();
-sub AF_DECnet		();
-sub AF_DLI		();
-sub AF_ECMA		();
-sub AF_GOSIP		();
-sub AF_HYLINK		();
-sub AF_IMPLINK		();
-sub AF_INET		();
-sub AF_LAT		();
-sub AF_MAX		();
-sub AF_NBS		();
-sub AF_NIT		();
-sub AF_NS		();
-sub AF_OSI		();
-sub AF_OSINET		();
-sub AF_PUP		();
-sub AF_SNA		();
-sub AF_UNIX		();
-sub AF_UNSPEC		();
-sub AF_X25		();
-sub IOV_MAX		();
-sub MSG_BCAST		();
-sub MSG_CTLFLAGS	();
-sub MSG_CTLIGNORE	();
-sub MSG_CTRUNC		();
-sub MSG_DONTROUTE	();
-sub MSG_DONTWAIT	();
-sub MSG_EOF		();
-sub MSG_EOR		();
-sub MSG_ERRQUEUE	();
-sub MSG_FIN		();
-sub MSG_MAXIOVLEN	();
-sub MSG_MCAST		();
-sub MSG_NOSIGNAL	();
-sub MSG_OOB		();
-sub MSG_PEEK		();
-sub MSG_PROXY		();
-sub MSG_RST		();
-sub MSG_SYN		();
-sub MSG_TRUNC		();
-sub MSG_URG		();
-sub MSG_WAITALL		();
-sub PF_802		();
-sub PF_APPLETALK	();
-sub PF_CCITT		();
-sub PF_CHAOS		();
-sub PF_DATAKIT		();
-sub PF_DECnet		();
-sub PF_DLI		();
-sub PF_ECMA		();
-sub PF_GOSIP		();
-sub PF_HYLINK		();
-sub PF_IMPLINK		();
-sub PF_INET		();
-sub PF_LAT		();
-sub PF_MAX		();
-sub PF_NBS		();
-sub PF_NIT		();
-sub PF_NS		();
-sub PF_OSI		();
-sub PF_OSINET		();
-sub PF_PUP		();
-sub PF_SNA		();
-sub PF_UNIX		();
-sub PF_UNSPEC		();
-sub PF_X25		();
-sub SCM_CONNECT		();
-sub SCM_CREDENTIALS	();
-sub SCM_CREDS		();
-sub SCM_RIGHTS		();
-sub SCM_TIMESTAMP	();
-sub SHUT_RD		();
-sub SHUT_RDWR		();
-sub SHUT_WR		();
-sub SOCK_DGRAM		();
-sub SOCK_RAW		();
-sub SOCK_RDM		();
-sub SOCK_SEQPACKET	();
-sub SOCK_STREAM		();
-sub SOL_SOCKET		();
-sub SOMAXCONN		();
-sub SO_ACCEPTCONN	();
-sub SO_BROADCAST	();
-sub SO_DEBUG		();
-sub SO_DONTLINGER	();
-sub SO_DONTROUTE	();
-sub SO_ERROR		();
-sub SO_KEEPALIVE	();
-sub SO_LINGER		();
-sub SO_OOBINLINE	();
-sub SO_RCVBUF		();
-sub SO_RCVLOWAT		();
-sub SO_RCVTIMEO		();
-sub SO_REUSEADDR	();
-sub SO_SNDBUF		();
-sub SO_SNDLOWAT		();
-sub SO_SNDTIMEO		();
-sub SO_TYPE		();
-sub SO_USELOOPBACK	();
-sub UIO_MAXIOV		();
-
 sub AUTOLOAD {
     my($constname);
     ($constname = $AUTOLOAD) =~ s/.*:://;