diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/utils/mb/encnames.c | 8 | ||||
| -rw-r--r-- | src/backend/utils/mb/wchar.c | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/utils/mb/encnames.c b/src/backend/utils/mb/encnames.c index 1d0522427c4..634861a2053 100644 --- a/src/backend/utils/mb/encnames.c +++ b/src/backend/utils/mb/encnames.c @@ -2,7 +2,7 @@ * Encoding names and routines for work with it. All * in this file is shared bedween FE and BE. * - * $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.18 2003/11/29 22:39:59 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.19 2004/09/17 21:59:57 petere Exp $ */ #ifdef FRONTEND #include "postgres_fe.h" @@ -341,6 +341,9 @@ pg_enc2name pg_enc2name_tbl[] = "ISO_8859_8", PG_ISO_8859_8 }, { + "WIN1250", PG_WIN1250 + }, + { "SJIS", PG_SJIS }, { @@ -353,9 +356,6 @@ pg_enc2name pg_enc2name_tbl[] = "UHC", PG_UHC }, { - "WIN1250", PG_WIN1250 - }, - { "GB18030", PG_GB18030 } }; diff --git a/src/backend/utils/mb/wchar.c b/src/backend/utils/mb/wchar.c index 5f198ffa517..0df562a5a6d 100644 --- a/src/backend/utils/mb/wchar.c +++ b/src/backend/utils/mb/wchar.c @@ -1,7 +1,7 @@ /* * conversion functions between pg_wchar and multibyte streams. * Tatsuo Ishii - * $PostgreSQL: pgsql/src/backend/utils/mb/wchar.c,v 1.37 2004/08/29 05:06:51 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/mb/wchar.c,v 1.38 2004/09/17 21:59:57 petere Exp $ * * WIN1250 client encoding updated by Pavel Behal * @@ -743,11 +743,11 @@ pg_wchar_tbl pg_wchar_table[] = { {pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, 1}, /* 25; ISO-8859-6 */ {pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, 1}, /* 26; ISO-8859-7 */ {pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, 1}, /* 27; ISO-8859-8 */ - {0, pg_sjis_mblen, pg_sjis_dsplen, 2}, /* 28; PG_SJIS */ - {0, pg_big5_mblen, pg_big5_dsplen, 2}, /* 29; PG_BIG5 */ - {0, pg_gbk_mblen, pg_gbk_dsplen, 2}, /* 30; PG_GBK */ - {0, pg_uhc_mblen, pg_uhc_dsplen, 2}, /* 31; PG_UHC */ - {pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, 1}, /* 32; PG_WIN1250 */ + {pg_latin12wchar_with_len, pg_latin1_mblen, pg_latin1_dsplen, 1}, /* 28; PG_WIN1250 */ + {0, pg_sjis_mblen, pg_sjis_dsplen, 2}, /* 29; PG_SJIS */ + {0, pg_big5_mblen, pg_big5_dsplen, 2}, /* 30; PG_BIG5 */ + {0, pg_gbk_mblen, pg_gbk_dsplen, 2}, /* 31; PG_GBK */ + {0, pg_uhc_mblen, pg_uhc_dsplen, 2}, /* 32; PG_UHC */ {0, pg_gb18030_mblen, pg_gb18030_dsplen, 2} /* 33; PG_GB18030 */ }; |