summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Bowers <neilb@neilb.org>2022-08-20 10:21:17 +0100
committerKarl Williamson <khw@cpan.org>2022-08-20 14:12:28 -0600
commit237d6790055e13c25f328ddfd18d61e0ed6e720f (patch)
tree87e65e0b99a680fc0305c5e2e7689b2982a416d1
parentd589be28e06652966250097cee26365c4efc6f61 (diff)
downloadperl-237d6790055e13c25f328ddfd18d61e0ed6e720f.tar.gz
Importing Socket 2.036 from CPAN
-rwxr-xr-xPorting/Maintainers.pl2
-rw-r--r--cpan/Socket/Socket.pm2
-rw-r--r--cpan/Socket/Socket.xs15
3 files changed, 10 insertions, 9 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index a448e3c3db..b4e012dad5 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1033,7 +1033,7 @@ use File::Glob qw(:case);
},
'Socket' => {
- 'DISTRIBUTION' => 'PEVANS/Socket-2.035.tar.gz',
+ 'DISTRIBUTION' => 'PEVANS/Socket-2.036.tar.gz',
'FILES' => q[cpan/Socket],
},
diff --git a/cpan/Socket/Socket.pm b/cpan/Socket/Socket.pm
index 2d65ec6794..6b01256523 100644
--- a/cpan/Socket/Socket.pm
+++ b/cpan/Socket/Socket.pm
@@ -3,7 +3,7 @@ package Socket;
use strict;
{ use v5.6.1; }
-our $VERSION = '2.035';
+our $VERSION = '2.036';
=head1 NAME
diff --git a/cpan/Socket/Socket.xs b/cpan/Socket/Socket.xs
index 1314925830..d14d83a77e 100644
--- a/cpan/Socket/Socket.xs
+++ b/cpan/Socket/Socket.xs
@@ -1197,13 +1197,14 @@ inet_ntop(af, ip_address_sv)
break;
#endif
default:
- croak("Bad address family for %s, got %d, should be"
#ifdef AF_INET6
- " either AF_INET or AF_INET6",
+# define WANT_FAMILY "either AF_INET or AF_INET6"
#else
- " AF_INET",
+# define WANT_FAMILY "AF_INET"
#endif
+ croak("Bad address family for %s, got %d, should be " WANT_FAMILY,
"Socket::inet_ntop", af);
+#undef WANT_FAMILY
}
if(addrlen < sizeof(addr)) {
@@ -1246,13 +1247,13 @@ inet_pton(af, host)
break;
#endif
default:
- croak("Bad address family for %s, got %d, should be"
#ifdef AF_INET6
- " either AF_INET or AF_INET6",
+# define WANT_FAMILY "either AF_INET or AF_INET6"
#else
- " AF_INET",
+# define WANT_FAMILY "AF_INET"
#endif
- "Socket::inet_pton", af);
+ croak("Bad address family for %s, got %d, should be " WANT_FAMILY, "Socket::inet_pton", af);
+#undef WANT_FAMILY
}
ok = (*host != '\0') && inet_pton(af, host, &ip_address);