Encode build fix-ups for VMS

Message-Id: <5.1.0.14.2.20020204161211.01c0a178@exchi01>

p4raw-id: //depot/perl@14552

diff --git a/MANIFEST b/MANIFEST
index 6048ce7..b5598d6 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -329,8 +329,8 @@ ext/Encode/Encode/symbol.enc                Encode table
 ext/Encode/Encode/symbol.ucm           Encode table
 ext/Encode/Encode/viscii.enc           Encode table
 ext/Encode/Encode/viscii.ucm           Encode table
-ext/Encode/EUC_JP/EUC_JP.pm    Enode module for euc-jp
-ext/Encode/EUC_JP/Makefile.PL  Enode module for euc-jp
+ext/Encode/EUC_JP/EUC_JP.pm            Encode module for euc-jp
+ext/Encode/EUC_JP/Makefile.PL          Encode module for euc-jp
 ext/Encode/lib/Encode/Encoding.pm      Encode extension
 ext/Encode/lib/Encode/Internal.pm      Encode extension
 ext/Encode/lib/Encode/iso10646_1.pm    Encode extension

diff --git a/configure.com b/configure.com
index c1c2a2c..19efea1 100644 (file)
--- a/configure.com
+++ b/configure.com
@@ -2519,6 +2519,7 @@ $   IF F$EXTRACT(0,4,line) .EQS. "ext/" THEN -
 $   IF xxx .EQS. "DynaLoader" THEN goto ext_loop     ! omit
 $   IF xxx .EQS. "SDBM_File/sdbm" THEN goto ext_loop ! sub extension - omit
 $   IF xxx .EQS. "Devel/PPPort/harness" THEN goto ext_loop ! sub extension - omit
+$   IF xxx .EQS. "Encode/EUC_JP" THEN goto ext_loop  ! sub extension - omit
 $   IF F$EXTRACT(0,8,line) .EQS. "vms/ext/" THEN -
       xxx = "VMS/" + F$EXTRACT(8,line_len - 20,line)
 $   known_extensions = known_extensions + " ''xxx'"

diff --git a/ext/Encode/EUC_JP/Makefile.PL b/ext/Encode/EUC_JP/Makefile.PL
index 6b65c9a..0327741 100644 (file)
--- a/ext/Encode/EUC_JP/Makefile.PL
+++ b/ext/Encode/EUC_JP/Makefile.PL
@@ -62,6 +62,11 @@ sub postamble
        $str .= " $table.c";
     }
     $str .= "\n\n";
+    foreach my $table (keys %tables)
+    {
+       $str .= "$table.c : $table.xs\n";
+    }
+    $str .= "\n";
     my $compile = $self->catfile($self->updir,'compile');
     foreach my $table (keys %tables)
     {

diff --git a/ext/Encode/Encode.xs b/ext/Encode/Encode.xs
index 53167f4..4dc16bb 100644 (file)
--- a/ext/Encode/Encode.xs
+++ b/ext/Encode/Encode.xs
@@ -244,7 +244,7 @@ PerlIOEncode_fill(pTHX_ PerlIO * f)
        /* Now get translated string (forced to UTF-8) and use as buffer */
        if (SvPOK(uni)) {
            s = SvPVutf8(uni, len);
-           if (len && !is_utf8_string(s,len)) {
+           if (len && !is_utf8_string((U8*)s,len)) {
                Perl_warn(aTHX_ "panic: decode did not return UTF-8 '%.*s'",(int) len,s);
            }
        }