diff options
author | Siep Kroonenberg <siepo@cybercomm.nl> | 2021-03-03 11:04:20 +0000 |
---|---|---|
committer | Siep Kroonenberg <siepo@cybercomm.nl> | 2021-03-03 11:04:20 +0000 |
commit | 13c3572d26e0868b9665513e4646ade860ae7810 (patch) | |
tree | 72f68d7c1270cc0a1d504f8eeb45d4de6b36f2d1 /Master/tlpkg/tlperl/lib/Encode | |
parent | 87d16a01498a53c4bb455d78ae7131370e47591e (diff) |
Updated tlperl
git-svn-id: svn://tug.org/texlive/trunk@58075 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/tlperl/lib/Encode')
-rw-r--r-- | Master/tlpkg/tlperl/lib/Encode/Guess.pm | 4 | ||||
-rw-r--r-- | Master/tlpkg/tlperl/lib/Encode/encode.h | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Master/tlpkg/tlperl/lib/Encode/Guess.pm b/Master/tlpkg/tlperl/lib/Encode/Guess.pm index 41fc19b7991..87a725d9993 100644 --- a/Master/tlpkg/tlperl/lib/Encode/Guess.pm +++ b/Master/tlpkg/tlperl/lib/Encode/Guess.pm @@ -2,7 +2,7 @@ package Encode::Guess; use strict; use warnings; use Encode qw(:fallbacks find_encoding); -our $VERSION = do { my @r = ( q$Revision: 2.7 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; +our $VERSION = do { my @r = ( q$Revision: 2.8 $ =~ /\d+/g ); sprintf "%d." . "%02d" x $#r, @r }; my $Canon = 'Guess'; use constant DEBUG => !!$ENV{PERL_ENCODE_DEBUG}; @@ -158,7 +158,7 @@ sub guess { $nline++; } $try{ascii} - or return "Encodings too ambiguous: ", join( " or ", keys %try ); + or return "Encodings too ambiguous: " . join( " or ", keys %try ); return $try{ascii}; } diff --git a/Master/tlpkg/tlperl/lib/Encode/encode.h b/Master/tlpkg/tlperl/lib/Encode/encode.h index 5d7663d5b55..ba884d42d1a 100644 --- a/Master/tlpkg/tlperl/lib/Encode/encode.h +++ b/Master/tlpkg/tlperl/lib/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 * |