summaryrefslogtreecommitdiff
path: root/cpan/Encode
diff options
context:
space:
mode:
authorDan Kogai <dankogai@dan.co.jp>2019-12-25 20:01:43 -0500
committerJames E Keenan <jkeenan@cpan.org>2019-12-25 20:01:43 -0500
commitb3cc7c67ca565983de186f65a50776a09393c29b (patch)
tree78d55255d58bc3606db31e1e07fe83d370a27cd5 /cpan/Encode
parentb276f0d36ace18a1dd14b69f71b6e9eeff7db431 (diff)
downloadperl-b3cc7c67ca565983de186f65a50776a09393c29b.tar.gz
Sync with CPAN version 3.02
The main reason for the release update is to address https://github.com/Perl/perl5/issues/17382 From Changes: ! t/whatwg-aliases.t drop RELEASE_TESTING since Pumpking also uses it. ! bin/enc2xs Pulled: enc2xs: Add environment variable to suppress comments ! t/enc_utf8.t Pulled: fixup enc_utf8.t for ONLY_PRAGMA_WARNINGS ! Encode/encode.h Pulled: Fix linker errors
Diffstat (limited to 'cpan/Encode')
-rw-r--r--cpan/Encode/Encode.pm4
-rw-r--r--cpan/Encode/Encode.xs2
-rw-r--r--cpan/Encode/Encode/encode.h8
-rw-r--r--cpan/Encode/bin/enc2xs3
-rw-r--r--cpan/Encode/t/enc_utf8.t15
-rw-r--r--cpan/Encode/t/whatwg-aliases.t2
6 files changed, 22 insertions, 12 deletions
diff --git a/cpan/Encode/Encode.pm b/cpan/Encode/Encode.pm
index bc566879e3..6f8d85949a 100644
--- a/cpan/Encode/Encode.pm
+++ b/cpan/Encode/Encode.pm
@@ -1,5 +1,5 @@
#
-# $Id: Encode.pm,v 3.01 2019/03/13 00:25:25 dankogai Exp $
+# $Id: Encode.pm,v 3.02 2019/12/25 09:25:17 dankogai Exp $
#
package Encode;
use strict;
@@ -7,7 +7,7 @@ use warnings;
use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG};
our $VERSION;
BEGIN {
- $VERSION = sprintf "%d.%02d", q$Revision: 3.01 $ =~ /(\d+)/g;
+ $VERSION = sprintf "%d.%02d", q$Revision: 3.02 $ =~ /(\d+)/g;
require XSLoader;
XSLoader::load( __PACKAGE__, $VERSION );
}
diff --git a/cpan/Encode/Encode.xs b/cpan/Encode/Encode.xs
index feeccd8752..0d66ec36d9 100644
--- a/cpan/Encode/Encode.xs
+++ b/cpan/Encode/Encode.xs
@@ -1,5 +1,5 @@
/*
- $Id: Encode.xs,v 2.47 2019/03/13 00:26:18 dankogai Exp dankogai $
+ $Id: Encode.xs,v 2.47 2019/03/13 00:26:18 dankogai Exp $
*/
#define PERL_NO_GET_CONTEXT
diff --git a/cpan/Encode/Encode/encode.h b/cpan/Encode/Encode/encode.h
index 5d7663d5b5..ba884d42d1 100644
--- a/cpan/Encode/Encode/encode.h
+++ b/cpan/Encode/Encode/encode.h
@@ -280,6 +280,14 @@ S_new_msg_hv(const char * const message, /* The message text */
# define PERL_UNUSED_ARG(x) ((void)x)
# endif
+# ifndef memGT
+# define memGT(s1,s2,l) (memcmp(s1,s2,l) > 0)
+# endif
+
+# ifndef MIN
+# define MIN(a,b) ((a) < (b) ? (a) : (b))
+# endif
+
static const char malformed_text[] = "Malformed UTF-8 character";
static char *
diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs
index 619b64b757..7d4669e3c1 100644
--- a/cpan/Encode/bin/enc2xs
+++ b/cpan/Encode/bin/enc2xs
@@ -11,7 +11,7 @@ use warnings;
use Getopt::Std;
use Config;
my @orig_ARGV = @ARGV;
-our $VERSION = do { my @r = (q$Revision: 2.21 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 2.22 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
# These may get re-ordered.
# RAW is a do_now as inserted by &enter
@@ -144,6 +144,7 @@ getopts('CM:SQqOo:f:n:v',\%opt);
$opt{M} and make_makefile_pl($opt{M}, @ARGV);
$opt{C} and make_configlocal_pm($opt{C}, @ARGV);
$opt{v} ||= $ENV{ENC2XS_VERBOSE};
+$opt{q} ||= $ENV{ENC2XS_NO_COMMENTS};
sub verbose {
print STDERR @_ if $opt{v};
diff --git a/cpan/Encode/t/enc_utf8.t b/cpan/Encode/t/enc_utf8.t
index be7d487804..ea8b80d233 100644
--- a/cpan/Encode/t/enc_utf8.t
+++ b/cpan/Encode/t/enc_utf8.t
@@ -1,4 +1,4 @@
-# $Id: enc_utf8.t,v 2.5 2017/06/10 17:23:50 dankogai Exp $
+# $Id: enc_utf8.t,v 2.6 2019/12/25 09:23:21 dankogai Exp $
# This is the twin of enc_eucjp.t .
BEGIN {
@@ -8,21 +8,22 @@ BEGIN {
exit 0;
}
unless (find PerlIO::Layer 'perlio') {
- print "1..0 # Skip: PerlIO was not built\n";
- exit 0;
+ print "1..0 # Skip: PerlIO was not built\n";
+ exit 0;
}
if (ord("A") == 193) {
- print "1..0 # encoding pragma does not support EBCDIC platforms\n";
- exit(0);
+ print "1..0 # encoding pragma does not support EBCDIC platforms\n";
+ exit(0);
}
if ($] >= 5.025003 and !$Config{usecperl}){
- print "1..0 # Skip: Perl <=5.25.2 or cperl required\n";
- exit 0;
+ print "1..0 # Skip: Perl <=5.25.2 or cperl required\n";
+ exit 0;
}
}
no warnings "deprecated";
use encoding 'utf8';
+use warnings;
my @c = (127, 128, 255, 256);
diff --git a/cpan/Encode/t/whatwg-aliases.t b/cpan/Encode/t/whatwg-aliases.t
index ffc030bb75..ccb8a16e01 100644
--- a/cpan/Encode/t/whatwg-aliases.t
+++ b/cpan/Encode/t/whatwg-aliases.t
@@ -11,7 +11,7 @@
use Test::More
- ($ENV{AUTHOR_TESTING} || $ENV{RELEASE_TESTING})
+ $ENV{AUTHOR_TESTING}
? 'no_plan'
: (skip_all => 'For maintainers only');
use Encode 'find_encoding';