diff --git a/trunk/libs/libiconv/libiconv-1.16/lib/aliases.gperf b/trunk/libs/libiconv/libiconv-1.16/lib/aliases.gperf index c5388741428..cdd1c27975e 100644 --- a/trunk/libs/libiconv/libiconv-1.16/lib/aliases.gperf +++ b/trunk/libs/libiconv/libiconv-1.16/lib/aliases.gperf @@ -66,23 +66,6 @@ LATIN2, ei_iso8859_2 L2, ei_iso8859_2 CSISOLATIN2, ei_iso8859_2 ISO8859-2, ei_iso8859_2 -ISO-8859-5, ei_iso8859_5 -ISO_8859-5, ei_iso8859_5 -ISO_8859-5:1988, ei_iso8859_5 -ISO-IR-144, ei_iso8859_5 -CYRILLIC, ei_iso8859_5 -CSISOLATINCYRILLIC, ei_iso8859_5 -ISO8859-5, ei_iso8859_5 -ISO-8859-15, ei_iso8859_15 -ISO_8859-15, ei_iso8859_15 -ISO_8859-15:1998, ei_iso8859_15 -ISO-IR-203, ei_iso8859_15 -LATIN-9, ei_iso8859_15 -ISO8859-15, ei_iso8859_15 -KOI8-R, ei_koi8_r -CSKOI8R, ei_koi8_r -KOI8-U, ei_koi8_u -KOI8-RU, ei_koi8_ru CP1250, ei_cp1250 WINDOWS-1250, ei_cp1250 MS-EE, ei_cp1250 diff --git a/trunk/libs/libiconv/libiconv-1.16/lib/aliases.h b/trunk/libs/libiconv/libiconv-1.16/lib/aliases.h index 9b14349dd99..ee75d68caef 100644 --- a/trunk/libs/libiconv/libiconv-1.16/lib/aliases.h +++ b/trunk/libs/libiconv/libiconv-1.16/lib/aliases.h @@ -32,12 +32,12 @@ #line 1 "lib/aliases.gperf" struct alias { int name; unsigned int encoding_index; }; -#define TOTAL_KEYWORDS 112 +#define TOTAL_KEYWORDS 95 #define MIN_WORD_LENGTH 2 #define MAX_WORD_LENGTH 19 -#define MIN_HASH_VALUE 3 -#define MAX_HASH_VALUE 182 -/* maximum key range = 180, duplicates = 0 */ +#define MIN_HASH_VALUE 10 +#define MAX_HASH_VALUE 154 +/* maximum key range = 145, duplicates = 0 */ #ifdef __GNUC__ __inline @@ -51,19 +51,19 @@ aliases_hash (register const char *str, register size_t len) { static const unsigned char asso_values[] = { - 183, 183, 183, 183, 183, 183, 183, 183, 183, 183, - 183, 183, 183, 183, 183, 183, 183, 183, 183, 183, - 183, 183, 183, 183, 183, 183, 183, 183, 183, 183, - 183, 183, 183, 183, 183, 183, 183, 183, 183, 183, - 183, 183, 183, 183, 183, 6, 183, 183, 0, 2, - 3, 41, 7, 0, 4, 18, 0, 0, 183, 183, - 183, 183, 183, 183, 183, 0, 55, 8, 21, 2, - 183, 59, 183, 0, 183, 59, 22, 62, 14, 0, - 8, 183, 30, 65, 15, 17, 183, 4, 1, 0, - 183, 183, 183, 183, 183, 67, 183, 183, 183, 183, - 183, 183, 183, 183, 183, 183, 183, 183, 183, 183, - 183, 183, 183, 183, 183, 183, 183, 183, 183, 183, - 183, 183, 183, 183, 183, 183, 183, 183 + 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, + 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, + 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, + 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, + 155, 155, 155, 155, 155, 4, 155, 155, 6, 5, + 4, 31, 17, 4, 4, 28, 5, 45, 155, 155, + 155, 155, 155, 155, 155, 5, 25, 4, 14, 5, + 155, 34, 155, 4, 155, 6, 4, 67, 11, 38, + 32, 155, 32, 46, 14, 15, 155, 4, 5, 12, + 155, 155, 155, 155, 155, 53, 155, 155, 155, 155, + 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, + 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, + 155, 155, 155, 155, 155, 155, 155, 155 }; register unsigned int hval = len; @@ -97,493 +97,420 @@ aliases_hash (register const char *str, register size_t len) struct stringpool_t { - char stringpool_str3[sizeof("850")]; - char stringpool_str5[sizeof("ASCII")]; - char stringpool_str6[sizeof("IBM850")]; - char stringpool_str7[sizeof("866")]; - char stringpool_str8[sizeof("IBM819")]; - char stringpool_str9[sizeof("ISO8859-5")]; - char stringpool_str10[sizeof("ISO8859-15")]; - char stringpool_str11[sizeof("ISO8859-1")]; - char stringpool_str12[sizeof("ISO8859-2")]; - char stringpool_str13[sizeof("CP850")]; - char stringpool_str15[sizeof("CP819")]; - char stringpool_str16[sizeof("ISO-8859-5")]; - char stringpool_str17[sizeof("CP1250")]; - char stringpool_str18[sizeof("IBM866")]; - char stringpool_str19[sizeof("ISO-8859-15")]; - char stringpool_str20[sizeof("ISO-8859-1")]; - char stringpool_str21[sizeof("CP1251")]; - char stringpool_str22[sizeof("ISO-8859-2")]; - char stringpool_str23[sizeof("CP1252")]; - char stringpool_str24[sizeof("CN")]; - char stringpool_str25[sizeof("CP866")]; - char stringpool_str26[sizeof("L1")]; - char stringpool_str27[sizeof("L2")]; - char stringpool_str28[sizeof("UTF-8")]; - char stringpool_str34[sizeof("UCS-2")]; - char stringpool_str36[sizeof("ISO-10646-UCS-2")]; - char stringpool_str39[sizeof("UTF-16")]; - char stringpool_str40[sizeof("ISO-10646-UCS-4")]; - char stringpool_str41[sizeof("CSUNICODE")]; - char stringpool_str42[sizeof("UCS-4")]; - char stringpool_str43[sizeof("EUCCN")]; - char stringpool_str44[sizeof("ISO646-CN")]; - char stringpool_str45[sizeof("CSUNICODE11")]; - char stringpool_str46[sizeof("LATIN1")]; - char stringpool_str48[sizeof("LATIN2")]; - char stringpool_str49[sizeof("LATIN-9")]; - char stringpool_str50[sizeof("EUC-CN")]; - char stringpool_str51[sizeof("ISO-IR-58")]; - char stringpool_str52[sizeof("ISO-IR-100")]; - char stringpool_str53[sizeof("CP367")]; - char stringpool_str54[sizeof("ISO-IR-6")]; - char stringpool_str56[sizeof("ISO-IR-101")]; - char stringpool_str59[sizeof("UCS-2LE")]; - char stringpool_str61[sizeof("UTF-16LE")]; - char stringpool_str62[sizeof("CP936")]; - char stringpool_str63[sizeof("UCS-4LE")]; - char stringpool_str64[sizeof("UTF-7")]; - char stringpool_str65[sizeof("CSUNICODE11UTF7")]; - char stringpool_str66[sizeof("ISO-IR-144")]; - char stringpool_str67[sizeof("UNICODE-1-1")]; - char stringpool_str68[sizeof("CYRILLIC")]; - char stringpool_str69[sizeof("ISO-IR-57")]; - char stringpool_str70[sizeof("UCS-2-INTERNAL")]; - char stringpool_str71[sizeof("GB_1988-80")]; + char stringpool_str10[sizeof("L2")]; + char stringpool_str11[sizeof("L1")]; + char stringpool_str12[sizeof("866")]; + char stringpool_str14[sizeof("850")]; + char stringpool_str17[sizeof("CN")]; + char stringpool_str21[sizeof("CP866")]; + char stringpool_str22[sizeof("ASCII")]; + char stringpool_str25[sizeof("CP850")]; + char stringpool_str26[sizeof("CP1252")]; + char stringpool_str27[sizeof("IBM866")]; + char stringpool_str28[sizeof("CP1251")]; + char stringpool_str30[sizeof("CP1250")]; + char stringpool_str31[sizeof("IBM850")]; + char stringpool_str32[sizeof("UCS-2")]; + char stringpool_str33[sizeof("LATIN2")]; + char stringpool_str34[sizeof("UTF-8")]; + char stringpool_str35[sizeof("LATIN1")]; + char stringpool_str36[sizeof("EUCCN")]; + char stringpool_str38[sizeof("UTF-16")]; + char stringpool_str40[sizeof("ISO-8859-2")]; + char stringpool_str41[sizeof("EUC-CN")]; + char stringpool_str42[sizeof("ISO-8859-1")]; + char stringpool_str43[sizeof("GBK")]; + char stringpool_str44[sizeof("UCS-2LE")]; + char stringpool_str45[sizeof("UTF-16LE")]; + char stringpool_str46[sizeof("ISO-10646-UCS-2")]; + char stringpool_str48[sizeof("CP936")]; + char stringpool_str50[sizeof("CSPC850MULTILINGUAL")]; + char stringpool_str53[sizeof("ISO646-CN")]; + char stringpool_str54[sizeof("UCS-2-INTERNAL")]; + char stringpool_str57[sizeof("UCS-4LE")]; + char stringpool_str58[sizeof("UCS-4")]; + char stringpool_str59[sizeof("ISO-10646-UCS-4")]; + char stringpool_str60[sizeof("ISO-IR-6")]; + char stringpool_str62[sizeof("ISO-IR-58")]; + char stringpool_str63[sizeof("US")]; + char stringpool_str64[sizeof("UTF-32")]; + char stringpool_str65[sizeof("UCS-2BE")]; + char stringpool_str66[sizeof("UTF-16BE")]; + char stringpool_str67[sizeof("UCS-4-INTERNAL")]; + char stringpool_str68[sizeof("ISO-IR-101")]; + char stringpool_str69[sizeof("CP367")]; + char stringpool_str70[sizeof("ISO-IR-100")]; + char stringpool_str71[sizeof("UTF-32LE")]; char stringpool_str72[sizeof("CHAR")]; - char stringpool_str73[sizeof("MS-EE")]; - char stringpool_str74[sizeof("UCS-4-INTERNAL")]; - char stringpool_str75[sizeof("CSKOI8R")]; - char stringpool_str76[sizeof("UTF-32")]; - char stringpool_str77[sizeof("ISO_8859-5")]; - char stringpool_str78[sizeof("UNICODELITTLE")]; - char stringpool_str79[sizeof("CSPC850MULTILINGUAL")]; - char stringpool_str80[sizeof("ISO_8859-15")]; - char stringpool_str81[sizeof("ISO_8859-1")]; - char stringpool_str82[sizeof("ISO_8859-5:1988")]; - char stringpool_str83[sizeof("ISO_8859-2")]; - char stringpool_str84[sizeof("US")]; - char stringpool_str85[sizeof("ISO_8859-15:1998")]; - char stringpool_str87[sizeof("IBM367")]; - char stringpool_str88[sizeof("CSASCII")]; - char stringpool_str89[sizeof("UNICODE-1-1-UTF-7")]; - char stringpool_str91[sizeof("CSISO58GB231280")]; - char stringpool_str92[sizeof("UCS-2BE")]; - char stringpool_str94[sizeof("UTF-16BE")]; - char stringpool_str95[sizeof("ISO646-US")]; - char stringpool_str96[sizeof("UCS-4BE")]; - char stringpool_str98[sizeof("US-ASCII")]; - char stringpool_str99[sizeof("UTF-32LE")]; - char stringpool_str100[sizeof("CHINESE")]; - char stringpool_str101[sizeof("CSUCS4")]; - char stringpool_str102[sizeof("ISO_8859-1:1987")]; - char stringpool_str103[sizeof("ISO_8859-2:1987")]; - char stringpool_str105[sizeof("KOI8-U")]; - char stringpool_str106[sizeof("CSISO57GB1988")]; - char stringpool_str107[sizeof("GB18030")]; - char stringpool_str109[sizeof("WINDOWS-1250")]; - char stringpool_str111[sizeof("WINDOWS-1251")]; - char stringpool_str112[sizeof("WINDOWS-1252")]; - char stringpool_str114[sizeof("GB2312")]; - char stringpool_str116[sizeof("MS936")]; - char stringpool_str118[sizeof("GB_2312-80")]; - char stringpool_str120[sizeof("CSGB2312")]; - char stringpool_str121[sizeof("GBK")]; - char stringpool_str122[sizeof("CSISOLATIN1")]; + char stringpool_str73[sizeof("CSASCII")]; + char stringpool_str75[sizeof("CSUNICODE")]; + char stringpool_str76[sizeof("ISO8859-2")]; + char stringpool_str77[sizeof("ISO8859-1")]; + char stringpool_str78[sizeof("UCS-4BE")]; + char stringpool_str80[sizeof("UTF-7")]; + char stringpool_str81[sizeof("CSGB2312")]; + char stringpool_str82[sizeof("CSUNICODE11")]; + char stringpool_str83[sizeof("CHINESE")]; + char stringpool_str84[sizeof("GB2312")]; + char stringpool_str85[sizeof("ISO-IR-57")]; + char stringpool_str86[sizeof("US-ASCII")]; + char stringpool_str87[sizeof("MS-EE")]; + char stringpool_str88[sizeof("ISO646-US")]; + char stringpool_str89[sizeof("ISO_8859-2")]; + char stringpool_str91[sizeof("ISO_8859-1")]; + char stringpool_str92[sizeof("UTF-32BE")]; + char stringpool_str93[sizeof("CN-GB")]; + char stringpool_str94[sizeof("CSUCS4")]; + char stringpool_str95[sizeof("GB18030")]; + char stringpool_str96[sizeof("UNICODE-1-1")]; + char stringpool_str100[sizeof("GB_2312-80")]; + char stringpool_str101[sizeof("IBM367")]; + char stringpool_str104[sizeof("CP819")]; + char stringpool_str108[sizeof("UNICODELITTLE")]; + char stringpool_str109[sizeof("CSUNICODE11UTF7")]; + char stringpool_str110[sizeof("IBM819")]; + char stringpool_str111[sizeof("MS936")]; + char stringpool_str116[sizeof("GB_1988-80")]; + char stringpool_str117[sizeof("CSIBM866")]; + char stringpool_str118[sizeof("ISO_8859-2:1987")]; + char stringpool_str119[sizeof("ISO_8859-1:1987")]; + char stringpool_str120[sizeof("ANSI_X3.4-1986")]; + char stringpool_str121[sizeof("ANSI_X3.4-1968")]; + char stringpool_str122[sizeof("CSISO58GB231280")]; char stringpool_str123[sizeof("CSISOLATIN2")]; - char stringpool_str129[sizeof("ANSI_X3.4-1968")]; - char stringpool_str130[sizeof("ISO_646.IRV:1991")]; - char stringpool_str131[sizeof("KOI8-R")]; - char stringpool_str132[sizeof("UTF-32BE")]; - char stringpool_str133[sizeof("ANSI_X3.4-1986")]; - char stringpool_str134[sizeof("ISO-IR-203")]; - char stringpool_str135[sizeof("CSISOLATINCYRILLIC")]; - char stringpool_str136[sizeof("KOI8-RU")]; - char stringpool_str138[sizeof("WCHAR_T")]; - char stringpool_str139[sizeof("UCS-2-SWAPPED")]; - char stringpool_str141[sizeof("CSIBM866")]; - char stringpool_str143[sizeof("UCS-4-SWAPPED")]; - char stringpool_str148[sizeof("MS-ANSI")]; - char stringpool_str150[sizeof("WINDOWS-936")]; - char stringpool_str151[sizeof("MS-CYRL")]; - char stringpool_str176[sizeof("UNICODEBIG")]; - char stringpool_str182[sizeof("CN-GB")]; + char stringpool_str124[sizeof("CSISOLATIN1")]; + char stringpool_str125[sizeof("UNICODE-1-1-UTF-7")]; + char stringpool_str126[sizeof("WINDOWS-1252")]; + char stringpool_str127[sizeof("WINDOWS-1251")]; + char stringpool_str128[sizeof("WINDOWS-1250")]; + char stringpool_str129[sizeof("WCHAR_T")]; + char stringpool_str130[sizeof("MS-CYRL")]; + char stringpool_str132[sizeof("UCS-2-SWAPPED")]; + char stringpool_str135[sizeof("ISO_646.IRV:1991")]; + char stringpool_str143[sizeof("CSISO57GB1988")]; + char stringpool_str144[sizeof("MS-ANSI")]; + char stringpool_str145[sizeof("UCS-4-SWAPPED")]; + char stringpool_str152[sizeof("WINDOWS-936")]; + char stringpool_str154[sizeof("UNICODEBIG")]; }; static const struct stringpool_t stringpool_contents = { + "L2", + "L1", + "866", "850", + "CN", + "CP866", "ASCII", - "IBM850", - "866", - "IBM819", - "ISO8859-5", - "ISO8859-15", - "ISO8859-1", - "ISO8859-2", "CP850", - "CP819", - "ISO-8859-5", - "CP1250", + "CP1252", "IBM866", - "ISO-8859-15", - "ISO-8859-1", "CP1251", - "ISO-8859-2", - "CP1252", - "CN", - "CP866", - "L1", - "L2", - "UTF-8", + "CP1250", + "IBM850", "UCS-2", - "ISO-10646-UCS-2", - "UTF-16", - "ISO-10646-UCS-4", - "CSUNICODE", - "UCS-4", - "EUCCN", - "ISO646-CN", - "CSUNICODE11", - "LATIN1", "LATIN2", - "LATIN-9", + "UTF-8", + "LATIN1", + "EUCCN", + "UTF-16", + "ISO-8859-2", "EUC-CN", - "ISO-IR-58", - "ISO-IR-100", - "CP367", - "ISO-IR-6", - "ISO-IR-101", + "ISO-8859-1", + "GBK", "UCS-2LE", "UTF-16LE", + "ISO-10646-UCS-2", "CP936", - "UCS-4LE", - "UTF-7", - "CSUNICODE11UTF7", - "ISO-IR-144", - "UNICODE-1-1", - "CYRILLIC", - "ISO-IR-57", - "UCS-2-INTERNAL", - "GB_1988-80", - "CHAR", - "MS-EE", - "UCS-4-INTERNAL", - "CSKOI8R", - "UTF-32", - "ISO_8859-5", - "UNICODELITTLE", "CSPC850MULTILINGUAL", - "ISO_8859-15", - "ISO_8859-1", - "ISO_8859-5:1988", - "ISO_8859-2", + "ISO646-CN", + "UCS-2-INTERNAL", + "UCS-4LE", + "UCS-4", + "ISO-10646-UCS-4", + "ISO-IR-6", + "ISO-IR-58", "US", - "ISO_8859-15:1998", - "IBM367", - "CSASCII", - "UNICODE-1-1-UTF-7", - "CSISO58GB231280", + "UTF-32", "UCS-2BE", "UTF-16BE", - "ISO646-US", - "UCS-4BE", - "US-ASCII", + "UCS-4-INTERNAL", + "ISO-IR-101", + "CP367", + "ISO-IR-100", "UTF-32LE", + "CHAR", + "CSASCII", + "CSUNICODE", + "ISO8859-2", + "ISO8859-1", + "UCS-4BE", + "UTF-7", + "CSGB2312", + "CSUNICODE11", "CHINESE", + "GB2312", + "ISO-IR-57", + "US-ASCII", + "MS-EE", + "ISO646-US", + "ISO_8859-2", + "ISO_8859-1", + "UTF-32BE", + "CN-GB", "CSUCS4", - "ISO_8859-1:1987", - "ISO_8859-2:1987", - "KOI8-U", - "CSISO57GB1988", "GB18030", - "WINDOWS-1250", - "WINDOWS-1251", - "WINDOWS-1252", - "GB2312", - "MS936", + "UNICODE-1-1", "GB_2312-80", - "CSGB2312", - "GBK", - "CSISOLATIN1", - "CSISOLATIN2", - "ANSI_X3.4-1968", - "ISO_646.IRV:1991", - "KOI8-R", - "UTF-32BE", + "IBM367", + "CP819", + "UNICODELITTLE", + "CSUNICODE11UTF7", + "IBM819", + "MS936", + "GB_1988-80", + "CSIBM866", + "ISO_8859-2:1987", + "ISO_8859-1:1987", "ANSI_X3.4-1986", - "ISO-IR-203", - "CSISOLATINCYRILLIC", - "KOI8-RU", + "ANSI_X3.4-1968", + "CSISO58GB231280", + "CSISOLATIN2", + "CSISOLATIN1", + "UNICODE-1-1-UTF-7", + "WINDOWS-1252", + "WINDOWS-1251", + "WINDOWS-1250", "WCHAR_T", + "MS-CYRL", "UCS-2-SWAPPED", - "CSIBM866", - "UCS-4-SWAPPED", + "ISO_646.IRV:1991", + "CSISO57GB1988", "MS-ANSI", + "UCS-4-SWAPPED", "WINDOWS-936", - "MS-CYRL", - "UNICODEBIG", - "CN-GB" + "UNICODEBIG" }; #define stringpool ((const char *) &stringpool_contents) static const struct alias aliases[] = { - {-1}, {-1}, {-1}, -#line 97 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str3, ei_cp850}, + {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, + {-1}, +#line 66 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str10, ei_iso8859_2}, +#line 58 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str11, ei_iso8859_1}, +#line 84 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str12, ei_cp866}, {-1}, +#line 80 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str14, ei_cp850}, + {-1}, {-1}, +#line 89 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str17, ei_iso646_cn}, + {-1}, {-1}, {-1}, +#line 82 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str21, ei_cp866}, #line 13 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str5, ei_ascii}, -#line 96 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str6, ei_cp850}, -#line 101 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str7, ei_cp866}, -#line 56 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str8, ei_iso8859_1}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str22, ei_ascii}, + {-1}, {-1}, +#line 78 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str25, ei_cp850}, #line 75 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str9, ei_iso8859_5}, -#line 81 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str10, ei_iso8859_15}, -#line 60 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str11, ei_iso8859_1}, -#line 68 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str12, ei_iso8859_2}, -#line 95 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str13, ei_cp850}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str26, ei_cp1252}, +#line 83 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str27, ei_cp866}, +#line 72 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str28, ei_cp1251}, {-1}, -#line 55 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str15, ei_iso8859_1}, #line 69 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str16, ei_iso8859_5}, -#line 86 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str17, ei_cp1250}, -#line 100 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str18, ei_cp866}, -#line 76 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str19, ei_iso8859_15}, -#line 51 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str20, ei_iso8859_1}, -#line 89 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str21, ei_cp1251}, -#line 61 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str22, ei_iso8859_2}, -#line 92 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str23, ei_cp1252}, -#line 106 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str24, ei_iso646_cn}, -#line 99 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str25, ei_cp866}, -#line 58 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str26, ei_iso8859_1}, -#line 66 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str27, ei_iso8859_2}, -#line 23 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str28, ei_utf8}, - {-1}, {-1}, {-1}, {-1}, {-1}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str30, ei_cp1250}, +#line 79 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str31, ei_cp850}, #line 24 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str34, ei_ucs2}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str32, ei_ucs2}, +#line 65 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str33, ei_iso8859_2}, +#line 23 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str34, ei_utf8}, +#line 57 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str35, ei_iso8859_1}, +#line 96 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str36, ei_euc_cn}, + {-1}, +#line 38 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str38, ei_utf16}, {-1}, +#line 61 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str40, ei_iso8859_2}, +#line 95 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str41, ei_euc_cn}, +#line 51 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str42, ei_iso8859_1}, +#line 100 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str43, ei_ces_gbk}, +#line 31 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str44, ei_ucs2le}, +#line 40 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str45, ei_utf16le}, #line 25 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str36, ei_ucs2}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str46, ei_ucs2}, + {-1}, +#line 101 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str48, ei_cp936}, + {-1}, +#line 81 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str50, ei_cp850}, {-1}, {-1}, -#line 38 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str39, ei_utf16}, -#line 34 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str40, ei_ucs4}, -#line 26 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str41, ei_ucs2}, +#line 87 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str53, ei_iso646_cn}, +#line 47 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str54, ei_ucs2internal}, + {-1}, {-1}, +#line 37 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str57, ei_ucs4le}, #line 33 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str42, ei_ucs4}, -#line 113 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str43, ei_euc_cn}, -#line 104 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str44, ei_iso646_cn}, -#line 30 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str45, ei_ucs2be}, -#line 57 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str46, ei_iso8859_1}, - {-1}, -#line 65 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str48, ei_iso8859_2}, -#line 80 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str49, ei_iso8859_15}, -#line 112 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str50, ei_euc_cn}, -#line 109 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str51, ei_gb2312}, -#line 54 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str52, ei_iso8859_1}, -#line 19 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str53, ei_ascii}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str58, ei_ucs4}, +#line 34 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str59, ei_ucs4}, #line 16 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str54, ei_ascii}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str60, ei_ascii}, {-1}, +#line 92 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str62, ei_gb2312}, +#line 21 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str63, ei_ascii}, +#line 41 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str64, ei_utf32}, +#line 27 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str65, ei_ucs2be}, +#line 39 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str66, ei_utf16be}, +#line 49 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str67, ei_ucs4internal}, #line 64 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str56, ei_iso8859_2}, - {-1}, {-1}, -#line 31 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str59, ei_ucs2le}, - {-1}, -#line 40 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str61, ei_utf16le}, -#line 118 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str62, ei_cp936}, -#line 37 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str63, ei_ucs4le}, -#line 44 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str64, ei_utf7}, -#line 46 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str65, ei_utf7}, -#line 72 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str66, ei_iso8859_5}, -#line 29 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str67, ei_ucs2be}, -#line 73 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str68, ei_iso8859_5}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str68, ei_iso8859_2}, +#line 19 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str69, ei_ascii}, +#line 54 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str70, ei_iso8859_1}, +#line 43 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str71, ei_utf32le}, #line 105 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str69, ei_iso646_cn}, -#line 47 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str70, ei_ucs2internal}, -#line 103 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str71, ei_iso646_cn}, -#line 122 "lib/aliases.gperf" {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str72, ei_local_char}, -#line 88 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str73, ei_cp1250}, -#line 49 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str74, ei_ucs4internal}, -#line 83 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str75, ei_koi8_r}, -#line 41 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str76, ei_utf32}, -#line 70 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str77, ei_iso8859_5}, -#line 32 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str78, ei_ucs2le}, -#line 98 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str79, ei_cp850}, -#line 77 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str80, ei_iso8859_15}, -#line 52 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str81, ei_iso8859_1}, -#line 71 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str82, ei_iso8859_5}, -#line 62 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str83, ei_iso8859_2}, -#line 21 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str84, ei_ascii}, -#line 78 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str85, ei_iso8859_15}, - {-1}, -#line 20 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str87, ei_ascii}, #line 22 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str88, ei_ascii}, -#line 45 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str89, ei_utf7}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str73, ei_ascii}, {-1}, -#line 110 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str91, ei_gb2312}, -#line 27 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str92, ei_ucs2be}, - {-1}, -#line 39 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str94, ei_utf16be}, -#line 14 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str95, ei_ascii}, +#line 26 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str75, ei_ucs2}, +#line 68 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str76, ei_iso8859_2}, +#line 60 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str77, ei_iso8859_1}, #line 36 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str96, ei_ucs4be}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str78, ei_ucs4be}, {-1}, +#line 44 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str80, ei_utf7}, +#line 99 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str81, ei_euc_cn}, +#line 30 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str82, ei_ucs2be}, +#line 94 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str83, ei_gb2312}, +#line 97 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str84, ei_euc_cn}, +#line 88 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str85, ei_iso646_cn}, #line 12 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str98, ei_ascii}, -#line 43 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str99, ei_utf32le}, -#line 111 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str100, ei_gb2312}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str86, ei_ascii}, +#line 71 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str87, ei_cp1250}, +#line 14 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str88, ei_ascii}, +#line 62 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str89, ei_iso8859_2}, + {-1}, +#line 52 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str91, ei_iso8859_1}, +#line 42 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str92, ei_utf32be}, +#line 98 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str93, ei_euc_cn}, #line 35 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str101, ei_ucs4}, -#line 53 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str102, ei_iso8859_1}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str94, ei_ucs4}, +#line 104 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str95, ei_gb18030}, +#line 29 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str96, ei_ucs2be}, + {-1}, {-1}, {-1}, +#line 91 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str100, ei_gb2312}, +#line 20 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str101, ei_ascii}, + {-1}, {-1}, +#line 55 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str104, ei_iso8859_1}, + {-1}, {-1}, {-1}, +#line 32 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str108, ei_ucs2le}, +#line 46 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str109, ei_utf7}, +#line 56 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str110, ei_iso8859_1}, +#line 102 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str111, ei_cp936}, + {-1}, {-1}, {-1}, {-1}, +#line 86 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str116, ei_iso646_cn}, +#line 85 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str117, ei_cp866}, #line 63 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str103, ei_iso8859_2}, - {-1}, -#line 84 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str105, ei_koi8_u}, -#line 107 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str106, ei_iso646_cn}, -#line 121 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str107, ei_gb18030}, - {-1}, -#line 87 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str109, ei_cp1250}, - {-1}, -#line 90 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str111, ei_cp1251}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str118, ei_iso8859_2}, +#line 53 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str119, ei_iso8859_1}, +#line 18 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str120, ei_ascii}, +#line 17 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str121, ei_ascii}, #line 93 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str112, ei_cp1252}, - {-1}, -#line 114 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str114, ei_euc_cn}, - {-1}, -#line 119 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str116, ei_cp936}, - {-1}, -#line 108 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str118, ei_gb2312}, - {-1}, -#line 116 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str120, ei_euc_cn}, -#line 117 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str121, ei_ces_gbk}, -#line 59 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str122, ei_iso8859_1}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str122, ei_gb2312}, #line 67 "lib/aliases.gperf" {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str123, ei_iso8859_2}, - {-1}, {-1}, {-1}, {-1}, {-1}, -#line 17 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str129, ei_ascii}, -#line 15 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str130, ei_ascii}, -#line 82 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str131, ei_koi8_r}, -#line 42 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str132, ei_utf32be}, -#line 18 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str133, ei_ascii}, -#line 79 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str134, ei_iso8859_15}, +#line 59 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str124, ei_iso8859_1}, +#line 45 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str125, ei_utf7}, +#line 76 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str126, ei_cp1252}, +#line 73 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str127, ei_cp1251}, +#line 70 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str128, ei_cp1250}, +#line 106 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str129, ei_local_wchar_t}, #line 74 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str135, ei_iso8859_5}, -#line 85 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str136, ei_koi8_ru}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str130, ei_cp1251}, {-1}, -#line 123 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str138, ei_local_wchar_t}, #line 48 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str139, ei_ucs2swapped}, - {-1}, -#line 102 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str141, ei_cp866}, - {-1}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str132, ei_ucs2swapped}, + {-1}, {-1}, +#line 15 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str135, ei_ascii}, + {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, +#line 90 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str143, ei_iso646_cn}, +#line 77 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str144, ei_cp1252}, #line 50 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str143, ei_ucs4swapped}, - {-1}, {-1}, {-1}, {-1}, -#line 94 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str148, ei_cp1252}, - {-1}, -#line 120 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str150, ei_cp936}, -#line 91 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str151, ei_cp1251}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str145, ei_ucs4swapped}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, +#line 103 "lib/aliases.gperf" + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str152, ei_cp936}, + {-1}, #line 28 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str176, ei_ucs2be}, - {-1}, {-1}, {-1}, {-1}, {-1}, -#line 115 "lib/aliases.gperf" - {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str182, ei_euc_cn} + {(int)(size_t)&((struct stringpool_t *)0)->stringpool_str154, ei_ucs2be} }; const struct alias * diff --git a/trunk/libs/libiconv/libiconv-1.16/lib/canonical.h b/trunk/libs/libiconv/libiconv-1.16/lib/canonical.h index 90b9481b5ea..84514f46e58 100644 --- a/trunk/libs/libiconv/libiconv-1.16/lib/canonical.h +++ b/trunk/libs/libiconv/libiconv-1.16/lib/canonical.h @@ -1,37 +1,32 @@ - (int)(long)&((struct stringpool_t *)0)->stringpool_str98, - (int)(long)&((struct stringpool_t *)0)->stringpool_str28, + (int)(long)&((struct stringpool_t *)0)->stringpool_str86, (int)(long)&((struct stringpool_t *)0)->stringpool_str34, + (int)(long)&((struct stringpool_t *)0)->stringpool_str32, + (int)(long)&((struct stringpool_t *)0)->stringpool_str65, + (int)(long)&((struct stringpool_t *)0)->stringpool_str44, + (int)(long)&((struct stringpool_t *)0)->stringpool_str58, + (int)(long)&((struct stringpool_t *)0)->stringpool_str78, + (int)(long)&((struct stringpool_t *)0)->stringpool_str57, + (int)(long)&((struct stringpool_t *)0)->stringpool_str38, + (int)(long)&((struct stringpool_t *)0)->stringpool_str66, + (int)(long)&((struct stringpool_t *)0)->stringpool_str45, + (int)(long)&((struct stringpool_t *)0)->stringpool_str64, (int)(long)&((struct stringpool_t *)0)->stringpool_str92, - (int)(long)&((struct stringpool_t *)0)->stringpool_str59, - (int)(long)&((struct stringpool_t *)0)->stringpool_str42, - (int)(long)&((struct stringpool_t *)0)->stringpool_str96, - (int)(long)&((struct stringpool_t *)0)->stringpool_str63, - (int)(long)&((struct stringpool_t *)0)->stringpool_str39, - (int)(long)&((struct stringpool_t *)0)->stringpool_str94, - (int)(long)&((struct stringpool_t *)0)->stringpool_str61, - (int)(long)&((struct stringpool_t *)0)->stringpool_str76, + (int)(long)&((struct stringpool_t *)0)->stringpool_str71, + (int)(long)&((struct stringpool_t *)0)->stringpool_str80, + (int)(long)&((struct stringpool_t *)0)->stringpool_str54, (int)(long)&((struct stringpool_t *)0)->stringpool_str132, - (int)(long)&((struct stringpool_t *)0)->stringpool_str99, - (int)(long)&((struct stringpool_t *)0)->stringpool_str64, - (int)(long)&((struct stringpool_t *)0)->stringpool_str70, - (int)(long)&((struct stringpool_t *)0)->stringpool_str139, - (int)(long)&((struct stringpool_t *)0)->stringpool_str74, - (int)(long)&((struct stringpool_t *)0)->stringpool_str143, - (int)(long)&((struct stringpool_t *)0)->stringpool_str20, - (int)(long)&((struct stringpool_t *)0)->stringpool_str22, - (int)(long)&((struct stringpool_t *)0)->stringpool_str16, - (int)(long)&((struct stringpool_t *)0)->stringpool_str19, - (int)(long)&((struct stringpool_t *)0)->stringpool_str131, - (int)(long)&((struct stringpool_t *)0)->stringpool_str105, - (int)(long)&((struct stringpool_t *)0)->stringpool_str136, - (int)(long)&((struct stringpool_t *)0)->stringpool_str17, - (int)(long)&((struct stringpool_t *)0)->stringpool_str21, - (int)(long)&((struct stringpool_t *)0)->stringpool_str23, - (int)(long)&((struct stringpool_t *)0)->stringpool_str13, + (int)(long)&((struct stringpool_t *)0)->stringpool_str67, + (int)(long)&((struct stringpool_t *)0)->stringpool_str145, + (int)(long)&((struct stringpool_t *)0)->stringpool_str42, + (int)(long)&((struct stringpool_t *)0)->stringpool_str40, + (int)(long)&((struct stringpool_t *)0)->stringpool_str30, + (int)(long)&((struct stringpool_t *)0)->stringpool_str28, + (int)(long)&((struct stringpool_t *)0)->stringpool_str26, (int)(long)&((struct stringpool_t *)0)->stringpool_str25, - (int)(long)&((struct stringpool_t *)0)->stringpool_str71, - (int)(long)&((struct stringpool_t *)0)->stringpool_str118, - (int)(long)&((struct stringpool_t *)0)->stringpool_str50, - (int)(long)&((struct stringpool_t *)0)->stringpool_str121, - (int)(long)&((struct stringpool_t *)0)->stringpool_str62, - (int)(long)&((struct stringpool_t *)0)->stringpool_str107, + (int)(long)&((struct stringpool_t *)0)->stringpool_str21, + (int)(long)&((struct stringpool_t *)0)->stringpool_str116, + (int)(long)&((struct stringpool_t *)0)->stringpool_str100, + (int)(long)&((struct stringpool_t *)0)->stringpool_str41, + (int)(long)&((struct stringpool_t *)0)->stringpool_str43, + (int)(long)&((struct stringpool_t *)0)->stringpool_str48, + (int)(long)&((struct stringpool_t *)0)->stringpool_str95, diff --git a/trunk/libs/libiconv/libiconv-1.16/lib/canonical_local.h b/trunk/libs/libiconv/libiconv-1.16/lib/canonical_local.h index e51f858a87d..def0cdc8dae 100644 --- a/trunk/libs/libiconv/libiconv-1.16/lib/canonical_local.h +++ b/trunk/libs/libiconv/libiconv-1.16/lib/canonical_local.h @@ -1,2 +1,2 @@ (int)(long)&((struct stringpool_t *)0)->stringpool_str72, - (int)(long)&((struct stringpool_t *)0)->stringpool_str138, + (int)(long)&((struct stringpool_t *)0)->stringpool_str129, diff --git a/trunk/libs/libiconv/libiconv-1.16/lib/encodings.def b/trunk/libs/libiconv/libiconv-1.16/lib/encodings.def index 0b5878feff2..497e5481430 100644 --- a/trunk/libs/libiconv/libiconv-1.16/lib/encodings.def +++ b/trunk/libs/libiconv/libiconv-1.16/lib/encodings.def @@ -252,8 +252,6 @@ DEFENCODING(( "ISO-8859-4", /* IANA */ iso8859_4, { iso8859_4_mbtowc, NULL }, { iso8859_4_wctomb, NULL }) -#endif //if 0 - DEFENCODING(( "ISO-8859-5", /* IANA */ "ISO_8859-5", /* IANA */ "ISO_8859-5:1988", /* IANA */ @@ -271,8 +269,6 @@ DEFALIAS( "ISO88595", /* HP-UX */ iso8859_5) #endif -#if 0 - DEFENCODING(( "ISO-8859-6", /* IANA */ "ISO_8859-6", /* IANA */ "ISO_8859-6:1987", /* IANA */ @@ -395,8 +391,6 @@ DEFENCODING(( "ISO-8859-14", /* IANA, glibc */ iso8859_14, { iso8859_14_mbtowc, NULL }, { iso8859_14_wctomb, NULL }) -#endif //if 0 - DEFENCODING(( "ISO-8859-15", /* IANA, glibc */ "ISO_8859-15", /* IANA */ "ISO_8859-15:1998", /* glibc */ @@ -412,8 +406,6 @@ DEFALIAS( "ISO885915", /* HP-UX */ iso8859_15) #endif -#if 0 - DEFENCODING(( "ISO-8859-16", /* IANA */ "ISO_8859-16", /* IANA */ "ISO_8859-16:2001", /* IANA */ @@ -425,8 +417,6 @@ DEFENCODING(( "ISO-8859-16", /* IANA */ iso8859_16, { iso8859_16_mbtowc, NULL }, { iso8859_16_wctomb, NULL }) -#endif - DEFENCODING(( "KOI8-R", /* IANA, RFC 1489, X11R6.4, JDK 1.1 */ "csKOI8R", /* IANA */ /*"CP20866", Windows */ @@ -445,6 +435,8 @@ DEFENCODING(( "KOI8-RU", koi8_ru, { koi8_ru_mbtowc, NULL }, { koi8_ru_wctomb, NULL }) +#endif //if 0 + /* Windows 8-bit encodings */ DEFENCODING(( "CP1250", /* JDK 1.1 */ diff --git a/trunk/libs/libiconv/libiconv-1.16/lib/flags.h b/trunk/libs/libiconv/libiconv-1.16/lib/flags.h index f66acb2e777..d64b0773fca 100644 --- a/trunk/libs/libiconv/libiconv-1.16/lib/flags.h +++ b/trunk/libs/libiconv/libiconv-1.16/lib/flags.h @@ -33,11 +33,6 @@ #define ei_ucs4swapped_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS | HAVE_HANGUL_JAMO) #define ei_iso8859_1_oflags (HAVE_ACCENTS) #define ei_iso8859_2_oflags (HAVE_ACCENTS) -#define ei_iso8859_5_oflags (0) -#define ei_iso8859_15_oflags (0) -#define ei_koi8_r_oflags (0) -#define ei_koi8_u_oflags (0) -#define ei_koi8_ru_oflags (0) #define ei_cp1250_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS) #define ei_cp1251_oflags (HAVE_QUOTATION_MARKS) #define ei_cp1252_oflags (HAVE_ACCENTS | HAVE_QUOTATION_MARKS)