Further multibyte tweaks from Hiroshi.

diff --git a/multibyte.c b/multibyte.c
index 2df7947a6f5a3449b3489558f535c3c66586fe6c..60f9fe7bca997571599f4ae42700e0bc244fb6cf 100644 (file)
--- a/multibyte.c
+++ b/multibyte.c
@@ -28,7 +28,7 @@ pg_CS CS_Table[] =
    { "EUC_KR", EUC_KR },
    { "EUC_TW", EUC_TW },
    { "JOHAB", JOHAB },
-   { "UNICODE",    UTF8 },
+   { "UNICODE",    UNICODE },
    { "UTF8",   UTF8 },     /* Corresponding from Version 8.1 */
    { "MULE_INTERNAL",MULE_INTERNAL },
    { "LATIN1", LATIN1 },
@@ -42,13 +42,13 @@ pg_CS CS_Table[] =
    { "LATIN9", LATIN9 },
    { "LATIN10", LATIN10 },
    { "WIN1256", WIN1256 },
-   { "TCVN", WIN1258 },
+   { "TCVN", TCVN },
    { "WIN1258", WIN1258 },     /* Corresponding from Version 8.1 */
    { "WIN874", WIN874 },
    { "KOI8",   KOI8R },
-   { "WIN",    WIN1251 },
+   { "WIN",    WIN },
    { "WIN1251",    WIN1251 },  /* Corresponding from Version 8.1 */
-   { "ALT",    WIN866  },
+   { "ALT",    ALT  },
    { "WIN866", WIN866  },  /* Corresponding from Version 8.1 */
    { "ISO_8859_5", ISO_8859_5 },
    { "ISO_8859_6", ISO_8859_6 },

diff --git a/multibyte.h b/multibyte.h
index dcb5461fae650573c81c54bda6132b02900a252e..120e71f6074b248c191c6996ac5d2e9877a21f66 100644 (file)
--- a/multibyte.h
+++ b/multibyte.h
@@ -44,6 +44,12 @@
 #define UHC                    31  /* UHC */
 #define WIN1250                32  /* windows-1250 */
 #define GB18030                33  /* GB18030 */
+
+#define UNICODE                34  /* UNICODE ( < Ver8.1) */
+#define TCVN               35  /* TCVN ( < Ver8.1) */
+#define ALT                36  /* ALT ( < Var8.1) */
+#define WIN                37  /* WIN ( < Ver8.1) */
+
 #define OTHER              -1
 
 #define MAX_CHARACTERSET_NAME  24