From 4e1743c01c56b892b7a354ce13b44a570edbff00 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Tue, 12 Sep 2023 07:31:48 -0600 Subject: [PATCH] dist/IO: Use ppport definition of OpSIBLING This module uses ppport.h, and its definition of this macro is more robust than the module's. And in any event, there shouldn't be redundant definitions, so that fixes to ppport.h automatically propagate to here and other modules. --- dist/IO/IO.pm | 2 +- dist/IO/IO.xs | 4 ---- dist/IO/lib/IO/Dir.pm | 2 +- dist/IO/lib/IO/File.pm | 2 +- dist/IO/lib/IO/Handle.pm | 2 +- dist/IO/lib/IO/Pipe.pm | 2 +- dist/IO/lib/IO/Poll.pm | 2 +- dist/IO/lib/IO/Seekable.pm | 2 +- dist/IO/lib/IO/Select.pm | 2 +- dist/IO/lib/IO/Socket.pm | 2 +- dist/IO/lib/IO/Socket/INET.pm | 2 +- dist/IO/lib/IO/Socket/UNIX.pm | 2 +- 12 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dist/IO/IO.pm b/dist/IO/IO.pm index 256f37507a7e..d842e94d440e 100644 --- a/dist/IO/IO.pm +++ b/dist/IO/IO.pm @@ -7,7 +7,7 @@ use Carp; use strict; use warnings; -our $VERSION = "1.52"; +our $VERSION = "1.53"; XSLoader::load 'IO', $VERSION; sub import { diff --git a/dist/IO/IO.xs b/dist/IO/IO.xs index db78f4d9f0a9..e5baaad10527 100644 --- a/dist/IO/IO.xs +++ b/dist/IO/IO.xs @@ -56,10 +56,6 @@ typedef FILE * OutputStream; # define NORETURN_FUNCTION_END /* NOT REACHED */ return 0 #endif -#ifndef OpSIBLING -# define OpSIBLING(o) (o)->op_sibling -#endif - static int not_here(const char *s) __attribute__noreturn__; static int not_here(const char *s) diff --git a/dist/IO/lib/IO/Dir.pm b/dist/IO/lib/IO/Dir.pm index 72cbed352283..8fb39000ff32 100644 --- a/dist/IO/lib/IO/Dir.pm +++ b/dist/IO/lib/IO/Dir.pm @@ -18,7 +18,7 @@ use File::stat; use File::Spec; our @ISA = qw(Tie::Hash Exporter); -our $VERSION = "1.52"; +our $VERSION = "1.53"; our @EXPORT_OK = qw(DIR_UNLINK); diff --git a/dist/IO/lib/IO/File.pm b/dist/IO/lib/IO/File.pm index a3ff37af50c6..b70dd043874b 100644 --- a/dist/IO/lib/IO/File.pm +++ b/dist/IO/lib/IO/File.pm @@ -135,7 +135,7 @@ require Exporter; our @ISA = qw(IO::Handle IO::Seekable Exporter); -our $VERSION = "1.52"; +our $VERSION = "1.53"; our @EXPORT = @IO::Seekable::EXPORT; diff --git a/dist/IO/lib/IO/Handle.pm b/dist/IO/lib/IO/Handle.pm index 18fe7140c138..f54ec9f611a0 100644 --- a/dist/IO/lib/IO/Handle.pm +++ b/dist/IO/lib/IO/Handle.pm @@ -270,7 +270,7 @@ use IO (); # Load the XS module require Exporter; our @ISA = qw(Exporter); -our $VERSION = "1.52"; +our $VERSION = "1.53"; our @EXPORT_OK = qw( autoflush diff --git a/dist/IO/lib/IO/Pipe.pm b/dist/IO/lib/IO/Pipe.pm index a99391edc4e1..2317cf92e7be 100644 --- a/dist/IO/lib/IO/Pipe.pm +++ b/dist/IO/lib/IO/Pipe.pm @@ -13,7 +13,7 @@ use strict; use Carp; use Symbol; -our $VERSION = "1.52"; +our $VERSION = "1.53"; sub new { my $type = shift; diff --git a/dist/IO/lib/IO/Poll.pm b/dist/IO/lib/IO/Poll.pm index 091461f6d7ae..750544126e6d 100644 --- a/dist/IO/lib/IO/Poll.pm +++ b/dist/IO/lib/IO/Poll.pm @@ -12,7 +12,7 @@ use IO::Handle; use Exporter (); our @ISA = qw(Exporter); -our $VERSION = "1.52"; +our $VERSION = "1.53"; our @EXPORT = qw( POLLIN POLLOUT diff --git a/dist/IO/lib/IO/Seekable.pm b/dist/IO/lib/IO/Seekable.pm index c2a1b308b6c5..e21573a42364 100644 --- a/dist/IO/lib/IO/Seekable.pm +++ b/dist/IO/lib/IO/Seekable.pm @@ -106,7 +106,7 @@ require Exporter; our @EXPORT = qw(SEEK_SET SEEK_CUR SEEK_END); our @ISA = qw(Exporter); -our $VERSION = "1.52"; +our $VERSION = "1.53"; sub seek { @_ == 3 or croak 'usage: $io->seek(POS, WHENCE)'; diff --git a/dist/IO/lib/IO/Select.pm b/dist/IO/lib/IO/Select.pm index 7eb99bd0eaa1..1ae353edbd6d 100644 --- a/dist/IO/lib/IO/Select.pm +++ b/dist/IO/lib/IO/Select.pm @@ -10,7 +10,7 @@ use strict; use warnings::register; require Exporter; -our $VERSION = "1.52"; +our $VERSION = "1.53"; our @ISA = qw(Exporter); # This is only so we can do version checking diff --git a/dist/IO/lib/IO/Socket.pm b/dist/IO/lib/IO/Socket.pm index 7c2540b35c4f..f6977f85ffb5 100644 --- a/dist/IO/lib/IO/Socket.pm +++ b/dist/IO/lib/IO/Socket.pm @@ -23,7 +23,7 @@ require IO::Socket::UNIX if ($^O ne 'epoc' && $^O ne 'symbian'); our @ISA = qw(IO::Handle); -our $VERSION = "1.52"; +our $VERSION = "1.53"; our @EXPORT_OK = qw(sockatmark); diff --git a/dist/IO/lib/IO/Socket/INET.pm b/dist/IO/lib/IO/Socket/INET.pm index 97d445043c4e..5cda8364e7e7 100644 --- a/dist/IO/lib/IO/Socket/INET.pm +++ b/dist/IO/lib/IO/Socket/INET.pm @@ -14,7 +14,7 @@ use Exporter; use Errno; our @ISA = qw(IO::Socket); -our $VERSION = "1.52"; +our $VERSION = "1.53"; my $EINVAL = exists(&Errno::EINVAL) ? Errno::EINVAL() : 1; diff --git a/dist/IO/lib/IO/Socket/UNIX.pm b/dist/IO/lib/IO/Socket/UNIX.pm index 89deec2620be..941cbd9dbf4f 100644 --- a/dist/IO/lib/IO/Socket/UNIX.pm +++ b/dist/IO/lib/IO/Socket/UNIX.pm @@ -11,7 +11,7 @@ use IO::Socket; use Carp; our @ISA = qw(IO::Socket); -our $VERSION = "1.52"; +our $VERSION = "1.53"; IO::Socket::UNIX->register_domain( AF_UNIX );