Better fix from Autrijus.

[p5sagit/p5-mst-13.2.git] / ext / Encode / Encode.pm

diff --git a/ext/Encode/Encode.pm b/ext/Encode/Encode.pm
index 5d21184..2084354 100644 (file)
--- a/ext/Encode/Encode.pm
+++ b/ext/Encode/Encode.pm
@@ -57,37 +57,28 @@ our %winlatin2cp   = (
                      'Vietnamese' => 1258,
                     );
 
-BEGIN {
-    our %external_tables =
-       (
-        'euc-cn'       => 'Encode/CN.pm',
-        gb2312         => 'Encode/CN.pm',
-        gb12345        => 'Encode/CN.pm',
-        gbk            => 'Encode/CN.pm',
-        cp936          => 'Encode/CN.pm',
-        'iso-ir-165'   => 'Encode/CN.pm',
-        'euc-jp'       => 'Encode/JP.pm',
-        shiftjis       => 'Encode/JP.pm',
-        macjapan       => 'Encode/JP.pm',
-        cp932          => 'Encode/JP.pm',
-        'euc-kr'       => 'Encode/KR.pm',
-        ksc5601        => 'Encode/KR.pm',
-        cp949          => 'Encode/KR.pm',
-        big5           => 'Encode/TW.pm',
-        'big5-hkscs'   => 'Encode/TW.pm',
-        cp950          => 'Encode/TW.pm',
-       );
-    
-    eval 'require Encode::HanExtra';
-    unless ($@) {
-       push %external_tables,
-       (
-        gb18030        => 'Encode/CN.pm', # HanExtra
-        big5plus       => 'Encode/TW.pm', # HanExtra
-        'euc-tw',      => 'Encode/TW.pm', # HanExtra
-       );
-    }
-}
+our %external_tables = 
+    (
+       'euc-cn'        => 'Encode/CN.pm',
+       gb2312          => 'Encode/CN.pm',
+       gb12345         => 'Encode/CN.pm',
+       gbk             => 'Encode/CN.pm',
+       cp936           => 'Encode/CN.pm',
+       'iso-ir-165'    => 'Encode/CN.pm',
+       'euc-jp'        => 'Encode/JP.pm',
+       shiftjis        => 'Encode/JP.pm',
+       macjapan        => 'Encode/JP.pm',
+       cp932           => 'Encode/JP.pm',
+       'euc-kr'        => 'Encode/KR.pm',
+       ksc5601         => 'Encode/KR.pm',
+       cp949           => 'Encode/KR.pm',
+       big5            => 'Encode/TW.pm',
+       'big5-hkscs'    => 'Encode/TW.pm',
+       cp950           => 'Encode/TW.pm',
+       gb18030         => 'Encode/HanExtra.pm',
+       big5plus        => 'Encode/HanExtra.pm',
+       'euc-tw'        => 'Encode/HanExtra.pm',
+    );
 
 sub encodings
 {