change#12065 seems to have broken Encode build on windows; fix

p4raw-link: @12065 on //depot/perl: 6275698708d25f5dab8a4495910263deacde43b5

p4raw-id: //depot/perl@12690

diff --git a/ext/Encode/Encode.xs b/ext/Encode/Encode.xs
index 87e8913..299af44 100644 (file)
--- a/ext/Encode/Encode.xs
+++ b/ext/Encode/Encode.xs
@@ -5,7 +5,7 @@
 #include "XSUB.h"
 #define U8 U8
 #include "encode.h"
-#include "iso8859.h"
+#include "8859.h"
 #include "EBCDIC.h"
 #include "Symbols.h"
 
@@ -661,7 +661,7 @@ BOOT:
 #if defined(USE_PERLIO) && !defined(USE_SFIO)
  PerlIO_define_layer(aTHX_ &PerlIO_encode);
 #endif
-#include "iso8859.def"
+#include "8859.def"
 #include "EBCDIC.def"
 #include "Symbols.def"
 }

diff --git a/ext/Encode/Makefile.PL b/ext/Encode/Makefile.PL
index 2ac571a..bf6baee 100644 (file)
--- a/ext/Encode/Makefile.PL
+++ b/ext/Encode/Makefile.PL
@@ -1,6 +1,6 @@
 use ExtUtils::MakeMaker;
 
-my %tables = (iso8859 => ['ascii.ucm', 'cp1250.ucm', 'koi8-r.ucm' ],
+my %tables = (8859 => ['ascii.ucm', 'cp1250.ucm', 'koi8-r.ucm' ],
               EBCDIC  => ['cp1047.ucm','cp37.ucm','posix-bc.ucm'],
               Symbols => ['symbol.ucm','dingbats.ucm'],
              );
@@ -10,7 +10,7 @@ while (defined(my $file = readdir(ENC)))
  {
   if ($file =~ /8859.*\.ucm/)
    {
-    push(@{$tables{iso8859}},$file);
+    push(@{$tables{8859}},$file);
    }
  }
 closedir(ENC);