summaryrefslogtreecommitdiff
path: root/cpan/Encode/TW
diff options
context:
space:
mode:
authorSteve Hay <steve.m.hay@googlemail.com>2014-05-06 20:40:56 +0100
committerDavid Mitchell <davem@iabyn.com>2014-05-08 10:25:49 +0100
commitc7981a06d5acac597f1bcbdd7664eb04ee6ad5bd (patch)
tree4cb62d0b78a675cd74f778e1833ce8b7d1708740 /cpan/Encode/TW
parent0d95c67f310e651be3b885bb56bfa0ed9498ef70 (diff)
downloadperl-c7981a06d5acac597f1bcbdd7664eb04ee6ad5bd.tar.gz
re-apply: Upgrade to Encode-2.60
Commit dc396cc293 was reverted by 547245703 due to issues under g++. This commit re-applies the original commit; the next commit will fix those issues. ----- This upgrade includes the blead customizations from 080a704606 and 9e9002efd1 (amongst other changes) so that Perl 5.20.0 can ship with an official CPAN release of Encode.
Diffstat (limited to 'cpan/Encode/TW')
-rw-r--r--cpan/Encode/TW/Makefile.PL5
1 files changed, 4 insertions, 1 deletions
diff --git a/cpan/Encode/TW/Makefile.PL b/cpan/Encode/TW/Makefile.PL
index f2cbeea991..c7711d9655 100644
--- a/cpan/Encode/TW/Makefile.PL
+++ b/cpan/Encode/TW/Makefile.PL
@@ -89,8 +89,11 @@ Encode_XSEncoding(pTHX_ encode_t *enc)
{
dSP;
HV *stash = gv_stashpv("Encode::XS", TRUE);
- SV *sv = sv_bless(newRV_noinc(newSViv(PTR2IV(enc))),stash);
+ SV *iv = newSViv(PTR2IV(enc));
+ SV *sv = sv_bless(newRV_noinc(iv),stash);
int i = 0;
+ SvFLAGS(iv) |= SVp_POK;
+ SvPVX(iv) = enc->name[0];
PUSHMARK(sp);
XPUSHs(sv);
while (enc->name[i])