diff options
author | Marcel Telka <marcel@telka.sk> | 2022-06-28 20:47:59 +0200 |
---|---|---|
committer | Karl Williamson <khw@cpan.org> | 2022-06-28 15:08:30 -0600 |
commit | 16cd6b5235051af6ba0adf88902ed224bd65b93c (patch) | |
tree | d790609ab84b48642ed1442c2e958aee7cc90df5 /dist/PathTools | |
parent | 31798a685edf1feafb2f251ac5096a193518cf2e (diff) | |
download | perl-16cd6b5235051af6ba0adf88902ed224bd65b93c.tar.gz |
PathTools/Cwd.xs: define SYSNAME/SYSNAME_LEN for OS390 only
This fixes the following warning on illumos based platforms:
Cwd.xs:27:0: warning: "SYSNAME" redefined
#define SYSNAME "$SYSNAME"
In file included from ../../perl.h:1111:0,
from Cwd.xs:8:
/usr/include/sys/param.h:184:0: note: this is the location of the previous definition
#define SYSNAME 9 /* # chars in system name */
Diffstat (limited to 'dist/PathTools')
-rw-r--r-- | dist/PathTools/Changes | 4 | ||||
-rw-r--r-- | dist/PathTools/Cwd.pm | 2 | ||||
-rw-r--r-- | dist/PathTools/Cwd.xs | 6 | ||||
-rw-r--r-- | dist/PathTools/lib/File/Spec.pm | 2 | ||||
-rw-r--r-- | dist/PathTools/lib/File/Spec/AmigaOS.pm | 2 | ||||
-rw-r--r-- | dist/PathTools/lib/File/Spec/Cygwin.pm | 2 | ||||
-rw-r--r-- | dist/PathTools/lib/File/Spec/Epoc.pm | 2 | ||||
-rw-r--r-- | dist/PathTools/lib/File/Spec/Functions.pm | 2 | ||||
-rw-r--r-- | dist/PathTools/lib/File/Spec/Mac.pm | 2 | ||||
-rw-r--r-- | dist/PathTools/lib/File/Spec/OS2.pm | 2 | ||||
-rw-r--r-- | dist/PathTools/lib/File/Spec/Unix.pm | 2 | ||||
-rw-r--r-- | dist/PathTools/lib/File/Spec/VMS.pm | 2 | ||||
-rw-r--r-- | dist/PathTools/lib/File/Spec/Win32.pm | 2 |
13 files changed, 19 insertions, 13 deletions
diff --git a/dist/PathTools/Changes b/dist/PathTools/Changes index 99e0fe3cfb..10f2635861 100644 --- a/dist/PathTools/Changes +++ b/dist/PathTools/Changes @@ -1,5 +1,9 @@ Revision history for Perl distribution PathTools. +3.86 + +- Fix compilation warning on illumos based platforms + 3.85 - Fix issue related to tainting empty PATH diff --git a/dist/PathTools/Cwd.pm b/dist/PathTools/Cwd.pm index 6fb135ce63..1163a34883 100644 --- a/dist/PathTools/Cwd.pm +++ b/dist/PathTools/Cwd.pm @@ -3,7 +3,7 @@ use strict; use Exporter; -our $VERSION = '3.85'; +our $VERSION = '3.86'; my $xs_version = $VERSION; $VERSION =~ tr/_//d; diff --git a/dist/PathTools/Cwd.xs b/dist/PathTools/Cwd.xs index 4fda057df8..f32e69fcf1 100644 --- a/dist/PathTools/Cwd.xs +++ b/dist/PathTools/Cwd.xs @@ -24,8 +24,10 @@ #endif /* For special handling of os390 sysplexed systems */ +#ifdef OS390 #define SYSNAME "$SYSNAME" #define SYSNAME_LEN (sizeof(SYSNAME) - 1) +#endif /* The realpath() implementation from OpenBSD 3.9 to 4.2 (realpath.c 1.13) * Renamed here to bsd_realpath() to avoid library conflicts. @@ -202,7 +204,7 @@ bsd_realpath(const char *path, char resolved[MAXPATHLEN]) if (slen < 0) return (NULL); symlink[slen] = '\0'; -# ifdef EBCDIC /* XXX Probably this should be only os390 */ +# ifdef OS390 /* Replace all instances of $SYSNAME/foo simply by /foo */ if (slen > SYSNAME_LEN + strlen(next_token) && strnEQ(symlink, SYSNAME, SYSNAME_LEN) @@ -245,7 +247,7 @@ bsd_realpath(const char *path, char resolved[MAXPATHLEN]) } remaining_len = my_strlcpy(remaining, symlink, sizeof(remaining)); } -# ifdef EBCDIC +# ifdef OS390 not_symlink: ; # endif } diff --git a/dist/PathTools/lib/File/Spec.pm b/dist/PathTools/lib/File/Spec.pm index da3c544b84..683a2470ff 100644 --- a/dist/PathTools/lib/File/Spec.pm +++ b/dist/PathTools/lib/File/Spec.pm @@ -2,7 +2,7 @@ package File::Spec; use strict; -our $VERSION = '3.85'; +our $VERSION = '3.86'; $VERSION =~ tr/_//d; my %module = ( diff --git a/dist/PathTools/lib/File/Spec/AmigaOS.pm b/dist/PathTools/lib/File/Spec/AmigaOS.pm index 0bb2d261cc..4e25855d91 100644 --- a/dist/PathTools/lib/File/Spec/AmigaOS.pm +++ b/dist/PathTools/lib/File/Spec/AmigaOS.pm @@ -3,7 +3,7 @@ package File::Spec::AmigaOS; use strict; require File::Spec::Unix; -our $VERSION = '3.85'; +our $VERSION = '3.86'; $VERSION =~ tr/_//d; our @ISA = qw(File::Spec::Unix); diff --git a/dist/PathTools/lib/File/Spec/Cygwin.pm b/dist/PathTools/lib/File/Spec/Cygwin.pm index aadc7c6009..b9f92cde61 100644 --- a/dist/PathTools/lib/File/Spec/Cygwin.pm +++ b/dist/PathTools/lib/File/Spec/Cygwin.pm @@ -3,7 +3,7 @@ package File::Spec::Cygwin; use strict; require File::Spec::Unix; -our $VERSION = '3.85'; +our $VERSION = '3.86'; $VERSION =~ tr/_//d; our @ISA = qw(File::Spec::Unix); diff --git a/dist/PathTools/lib/File/Spec/Epoc.pm b/dist/PathTools/lib/File/Spec/Epoc.pm index 4b9389a0ff..109cdd1b1d 100644 --- a/dist/PathTools/lib/File/Spec/Epoc.pm +++ b/dist/PathTools/lib/File/Spec/Epoc.pm @@ -2,7 +2,7 @@ package File::Spec::Epoc; use strict; -our $VERSION = '3.85'; +our $VERSION = '3.86'; $VERSION =~ tr/_//d; require File::Spec::Unix; diff --git a/dist/PathTools/lib/File/Spec/Functions.pm b/dist/PathTools/lib/File/Spec/Functions.pm index 1513715a9a..acdf10fa65 100644 --- a/dist/PathTools/lib/File/Spec/Functions.pm +++ b/dist/PathTools/lib/File/Spec/Functions.pm @@ -3,7 +3,7 @@ package File::Spec::Functions; use File::Spec; use strict; -our $VERSION = '3.85'; +our $VERSION = '3.86'; $VERSION =~ tr/_//d; require Exporter; diff --git a/dist/PathTools/lib/File/Spec/Mac.pm b/dist/PathTools/lib/File/Spec/Mac.pm index 34dc67c47b..f47432e580 100644 --- a/dist/PathTools/lib/File/Spec/Mac.pm +++ b/dist/PathTools/lib/File/Spec/Mac.pm @@ -4,7 +4,7 @@ use strict; use Cwd (); require File::Spec::Unix; -our $VERSION = '3.85'; +our $VERSION = '3.86'; $VERSION =~ tr/_//d; our @ISA = qw(File::Spec::Unix); diff --git a/dist/PathTools/lib/File/Spec/OS2.pm b/dist/PathTools/lib/File/Spec/OS2.pm index 5fe1751149..bb6a176353 100644 --- a/dist/PathTools/lib/File/Spec/OS2.pm +++ b/dist/PathTools/lib/File/Spec/OS2.pm @@ -4,7 +4,7 @@ use strict; use Cwd (); require File::Spec::Unix; -our $VERSION = '3.85'; +our $VERSION = '3.86'; $VERSION =~ tr/_//d; our @ISA = qw(File::Spec::Unix); diff --git a/dist/PathTools/lib/File/Spec/Unix.pm b/dist/PathTools/lib/File/Spec/Unix.pm index 77d5303809..6ae3fe862b 100644 --- a/dist/PathTools/lib/File/Spec/Unix.pm +++ b/dist/PathTools/lib/File/Spec/Unix.pm @@ -3,7 +3,7 @@ package File::Spec::Unix; use strict; use Cwd (); -our $VERSION = '3.85'; +our $VERSION = '3.86'; $VERSION =~ tr/_//d; =head1 NAME diff --git a/dist/PathTools/lib/File/Spec/VMS.pm b/dist/PathTools/lib/File/Spec/VMS.pm index eadea51a99..e909916fa2 100644 --- a/dist/PathTools/lib/File/Spec/VMS.pm +++ b/dist/PathTools/lib/File/Spec/VMS.pm @@ -4,7 +4,7 @@ use strict; use Cwd (); require File::Spec::Unix; -our $VERSION = '3.85'; +our $VERSION = '3.86'; $VERSION =~ tr/_//d; our @ISA = qw(File::Spec::Unix); diff --git a/dist/PathTools/lib/File/Spec/Win32.pm b/dist/PathTools/lib/File/Spec/Win32.pm index 56c1ba900c..fc3a65ec67 100644 --- a/dist/PathTools/lib/File/Spec/Win32.pm +++ b/dist/PathTools/lib/File/Spec/Win32.pm @@ -5,7 +5,7 @@ use strict; use Cwd (); require File::Spec::Unix; -our $VERSION = '3.85'; +our $VERSION = '3.86'; $VERSION =~ tr/_//d; our @ISA = qw(File::Spec::Unix); |