In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/a26fecbbe7f9ad305d4e7e45430c95829d6f5aac?hp=5647be137d8f560779e021036f72a4d53ad75bd9>
- Log ----------------------------------------------------------------- commit a26fecbbe7f9ad305d4e7e45430c95829d6f5aac Author: Craig A. Berry <[email protected]> Date: Tue Feb 21 21:09:03 2017 -0600 Revert "ext/VMS-Stdio: switch to using macros designed for string constant args" This reverts commit c0dea56fe487504493d97df5a7a6be57a2d2834d. The new macros introduced here have now just been rendered invisible by 8f71649941d02d5bdfe4f. Using macros that we can't see breaks the build, so revert this for now. It can be reintroduced when the macro names are settled and no longer hidden. ----------------------------------------------------------------------- Summary of changes: ext/VMS-Stdio/Stdio.pm | 2 +- ext/VMS-Stdio/Stdio.xs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/VMS-Stdio/Stdio.pm b/ext/VMS-Stdio/Stdio.pm index 6474900ef3..4d05994279 100644 --- a/ext/VMS-Stdio/Stdio.pm +++ b/ext/VMS-Stdio/Stdio.pm @@ -13,7 +13,7 @@ use Carp '&croak'; use DynaLoader (); use Exporter (); -$VERSION = '2.42'; +$VERSION = '2.41'; @ISA = qw( Exporter DynaLoader IO::File ); @EXPORT = qw( &O_APPEND &O_CREAT &O_EXCL &O_NDELAY &O_NOWAIT &O_RDONLY &O_RDWR &O_TRUNC &O_WRONLY ); diff --git a/ext/VMS-Stdio/Stdio.xs b/ext/VMS-Stdio/Stdio.xs index 5f20937303..144f9370cc 100644 --- a/ext/VMS-Stdio/Stdio.xs +++ b/ext/VMS-Stdio/Stdio.xs @@ -15,7 +15,7 @@ static bool constant(char *name, IV *pval) { - if (strNEs(name, "O_")) return FALSE; + if (strnNE(name, "O_", 2)) return FALSE; if (strEQ(name, "O_APPEND")) #ifdef O_APPEND @@ -88,10 +88,10 @@ newFH(PerlIO *fp, char type) { * symbol tables. This code (through io = ...) is really * equivalent to gv_fetchpv("VMS::Stdio::__FH__",TRUE,SVt_PVIO), * with a little less overhead, and good exercise for me. :-) */ - stashp = (GV **)hv_fetchs(PL_defstash,"VMS::",TRUE); + stashp = (GV **)hv_fetch(PL_defstash,"VMS::",5,TRUE); if (!stashp || *stashp == (GV *)&PL_sv_undef) return NULL; if (!(stash = GvHV(*stashp))) stash = GvHV(*stashp) = newHV(); - stashp = (GV **)hv_fetchs(GvHV(*stashp),"Stdio::",TRUE); + stashp = (GV **)hv_fetch(GvHV(*stashp),"Stdio::",7,TRUE); if (!stashp || *stashp == (GV *)&PL_sv_undef) return NULL; if (!(stash = GvHV(*stashp))) stash = GvHV(*stashp) = newHV(); -- Perl5 Master Repository
