summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/perl/ext/PerlIO-encoding
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/usr.bin/perl/ext/PerlIO-encoding')
-rw-r--r--gnu/usr.bin/perl/ext/PerlIO-encoding/encoding.pm2
-rw-r--r--gnu/usr.bin/perl/ext/PerlIO-encoding/encoding.xs2
-rwxr-xr-xgnu/usr.bin/perl/ext/PerlIO-encoding/t/encoding.t7
3 files changed, 4 insertions, 7 deletions
diff --git a/gnu/usr.bin/perl/ext/PerlIO-encoding/encoding.pm b/gnu/usr.bin/perl/ext/PerlIO-encoding/encoding.pm
index 35ad712d0a1..daf44571880 100644
--- a/gnu/usr.bin/perl/ext/PerlIO-encoding/encoding.pm
+++ b/gnu/usr.bin/perl/ext/PerlIO-encoding/encoding.pm
@@ -1,7 +1,7 @@
package PerlIO::encoding;
use strict;
-our $VERSION = '0.27';
+our $VERSION = '0.28';
our $DEBUG = 0;
$DEBUG and warn __PACKAGE__, " called by ", join(", ", caller), "\n";
diff --git a/gnu/usr.bin/perl/ext/PerlIO-encoding/encoding.xs b/gnu/usr.bin/perl/ext/PerlIO-encoding/encoding.xs
index 941d7862666..9d98d878db2 100644
--- a/gnu/usr.bin/perl/ext/PerlIO-encoding/encoding.xs
+++ b/gnu/usr.bin/perl/ext/PerlIO-encoding/encoding.xs
@@ -361,7 +361,7 @@ PerlIOEncode_fill(pTHX_ PerlIO * f)
if (!SvPOKp(e->dataSV)) (void)SvPV_force_nolen(e->dataSV);
use -= SvCUR(e->dataSV);
PerlIO_set_ptrcnt(n, ptr+use, (avail-use));
- /* and as we did not take it it isn't pending */
+ /* and as we did not take it, it isn't pending */
SvCUR_set(e->dataSV,0);
} else {
/* Got nothing - assume partial character so we need some more */
diff --git a/gnu/usr.bin/perl/ext/PerlIO-encoding/t/encoding.t b/gnu/usr.bin/perl/ext/PerlIO-encoding/t/encoding.t
index 41cefcb1377..367b0cf4f21 100755
--- a/gnu/usr.bin/perl/ext/PerlIO-encoding/t/encoding.t
+++ b/gnu/usr.bin/perl/ext/PerlIO-encoding/t/encoding.t
@@ -207,13 +207,10 @@ package Globber {
# important.
# We need a double eval, as scope unwinding will close the handle,
# which croaks.
-# Under debugging builds with PERL_DESTRUCT_LEVEL set, we have to skip this
+# With PERL_DESTRUCT_LEVEL set, we have to skip this
# test, as it triggers bug #115692, resulting in string table warnings.
-require Config;
SKIP: {
-skip "produces string table warnings", 2
- if "@{[Config::non_bincompat_options()]}" =~ /\bDEBUGGING\b/
- && $ENV{PERL_DESTRUCT_LEVEL};
+skip "produces string table warnings", 2 if $ENV{PERL_DESTRUCT_LEVEL};
eval { eval {
open my $fh, ">:encoding(globber)", \$buf;