1 diff -urN libiconv-1.11.old/lib/aliases_dos.h libiconv-1.11.new/lib/aliases_dos.h
2 --- libiconv-1.11.old/lib/aliases_dos.h 2005-05-19 19:08:39.000000000 +0200
3 +++ libiconv-1.11.new/lib/aliases_dos.h 2007-11-11 14:38:31.000000000 +0100
5 S(dos_1, "IBM437", ei_cp437 )
6 S(dos_2, "437", ei_cp437 )
7 S(dos_3, "CSPC8CODEPAGE437", ei_cp437 )
8 - S(dos_4, "CP737", ei_cp737 )
9 - S(dos_5, "CP775", ei_cp775 )
10 - S(dos_6, "IBM775", ei_cp775 )
11 - S(dos_7, "CSPC775BALTIC", ei_cp775 )
12 - S(dos_8, "CP852", ei_cp852 )
13 - S(dos_9, "IBM852", ei_cp852 )
14 - S(dos_10, "852", ei_cp852 )
15 - S(dos_11, "CSPCP852", ei_cp852 )
16 - S(dos_12, "CP853", ei_cp853 )
17 - S(dos_13, "CP855", ei_cp855 )
18 - S(dos_14, "IBM855", ei_cp855 )
19 - S(dos_15, "855", ei_cp855 )
20 - S(dos_16, "CSIBM855", ei_cp855 )
21 - S(dos_17, "CP857", ei_cp857 )
22 - S(dos_18, "IBM857", ei_cp857 )
23 - S(dos_19, "857", ei_cp857 )
24 - S(dos_20, "CSIBM857", ei_cp857 )
25 - S(dos_21, "CP858", ei_cp858 )
26 - S(dos_22, "CP860", ei_cp860 )
27 - S(dos_23, "IBM860", ei_cp860 )
28 - S(dos_24, "860", ei_cp860 )
29 - S(dos_25, "CSIBM860", ei_cp860 )
30 - S(dos_26, "CP861", ei_cp861 )
31 - S(dos_27, "IBM861", ei_cp861 )
32 - S(dos_28, "861", ei_cp861 )
33 - S(dos_29, "CP-IS", ei_cp861 )
34 - S(dos_30, "CSIBM861", ei_cp861 )
35 - S(dos_31, "CP863", ei_cp863 )
36 - S(dos_32, "IBM863", ei_cp863 )
37 - S(dos_33, "863", ei_cp863 )
38 - S(dos_34, "CSIBM863", ei_cp863 )
39 - S(dos_35, "CP864", ei_cp864 )
40 - S(dos_36, "IBM864", ei_cp864 )
41 - S(dos_37, "CSIBM864", ei_cp864 )
42 - S(dos_38, "CP865", ei_cp865 )
43 - S(dos_39, "IBM865", ei_cp865 )
44 - S(dos_40, "865", ei_cp865 )
45 - S(dos_41, "CSIBM865", ei_cp865 )
46 - S(dos_42, "CP869", ei_cp869 )
47 - S(dos_43, "IBM869", ei_cp869 )
48 - S(dos_44, "869", ei_cp869 )
49 - S(dos_45, "CP-GR", ei_cp869 )
50 - S(dos_46, "CSIBM869", ei_cp869 )
51 - S(dos_47, "CP1125", ei_cp1125 )
52 diff -urN libiconv-1.11.old/lib/aliases.gperf libiconv-1.11.new/lib/aliases.gperf
53 --- libiconv-1.11.old/lib/aliases.gperf 2006-05-18 14:45:17.000000000 +0200
54 +++ libiconv-1.11.new/lib/aliases.gperf 2007-11-11 14:38:02.000000000 +0100
56 UCS-2-SWAPPED, ei_ucs2swapped
57 UCS-4-INTERNAL, ei_ucs4internal
58 UCS-4-SWAPPED, ei_ucs4swapped
61 ISO-8859-1, ei_iso8859_1
62 ISO_8859-1, ei_iso8859_1
63 ISO_8859-1:1987, ei_iso8859_1
66 CSISOLATIN2, ei_iso8859_2
67 ISO8859-2, ei_iso8859_2
68 -ISO-8859-3, ei_iso8859_3
69 -ISO_8859-3, ei_iso8859_3
70 -ISO_8859-3:1988, ei_iso8859_3
71 -ISO-IR-109, ei_iso8859_3
74 -CSISOLATIN3, ei_iso8859_3
75 -ISO8859-3, ei_iso8859_3
76 -ISO-8859-4, ei_iso8859_4
77 -ISO_8859-4, ei_iso8859_4
78 -ISO_8859-4:1988, ei_iso8859_4
79 -ISO-IR-110, ei_iso8859_4
82 -CSISOLATIN4, ei_iso8859_4
83 -ISO8859-4, ei_iso8859_4
84 -ISO-8859-5, ei_iso8859_5
85 -ISO_8859-5, ei_iso8859_5
86 -ISO_8859-5:1988, ei_iso8859_5
87 -ISO-IR-144, ei_iso8859_5
88 -CYRILLIC, ei_iso8859_5
89 -CSISOLATINCYRILLIC, ei_iso8859_5
90 -ISO8859-5, ei_iso8859_5
91 -ISO-8859-6, ei_iso8859_6
92 -ISO_8859-6, ei_iso8859_6
93 -ISO_8859-6:1987, ei_iso8859_6
94 -ISO-IR-127, ei_iso8859_6
95 -ECMA-114, ei_iso8859_6
96 -ASMO-708, ei_iso8859_6
98 -CSISOLATINARABIC, ei_iso8859_6
99 -ISO8859-6, ei_iso8859_6
100 -ISO-8859-7, ei_iso8859_7
101 -ISO_8859-7, ei_iso8859_7
102 -ISO_8859-7:1987, ei_iso8859_7
103 -ISO_8859-7:2003, ei_iso8859_7
104 -ISO-IR-126, ei_iso8859_7
105 -ECMA-118, ei_iso8859_7
106 -ELOT_928, ei_iso8859_7
107 -GREEK8, ei_iso8859_7
109 -CSISOLATINGREEK, ei_iso8859_7
110 -ISO8859-7, ei_iso8859_7
111 -ISO-8859-8, ei_iso8859_8
112 -ISO_8859-8, ei_iso8859_8
113 -ISO_8859-8:1988, ei_iso8859_8
114 -ISO-IR-138, ei_iso8859_8
115 -HEBREW, ei_iso8859_8
116 -CSISOLATINHEBREW, ei_iso8859_8
117 -ISO8859-8, ei_iso8859_8
118 -ISO-8859-9, ei_iso8859_9
119 -ISO_8859-9, ei_iso8859_9
120 -ISO_8859-9:1989, ei_iso8859_9
121 -ISO-IR-148, ei_iso8859_9
122 -LATIN5, ei_iso8859_9
124 -CSISOLATIN5, ei_iso8859_9
125 -ISO8859-9, ei_iso8859_9
126 -ISO-8859-10, ei_iso8859_10
127 -ISO_8859-10, ei_iso8859_10
128 -ISO_8859-10:1992, ei_iso8859_10
129 -ISO-IR-157, ei_iso8859_10
130 -LATIN6, ei_iso8859_10
132 -CSISOLATIN6, ei_iso8859_10
133 -ISO8859-10, ei_iso8859_10
134 -ISO-8859-11, ei_iso8859_11
135 -ISO_8859-11, ei_iso8859_11
136 -ISO8859-11, ei_iso8859_11
137 -ISO-8859-13, ei_iso8859_13
138 -ISO_8859-13, ei_iso8859_13
139 -ISO-IR-179, ei_iso8859_13
140 -LATIN7, ei_iso8859_13
142 -ISO8859-13, ei_iso8859_13
143 -ISO-8859-14, ei_iso8859_14
144 -ISO_8859-14, ei_iso8859_14
145 -ISO_8859-14:1998, ei_iso8859_14
146 -ISO-IR-199, ei_iso8859_14
147 -LATIN8, ei_iso8859_14
149 -ISO-CELTIC, ei_iso8859_14
150 -ISO8859-14, ei_iso8859_14
151 ISO-8859-15, ei_iso8859_15
152 ISO_8859-15, ei_iso8859_15
153 ISO_8859-15:1998, ei_iso8859_15
154 ISO-IR-203, ei_iso8859_15
155 LATIN-9, ei_iso8859_15
156 ISO8859-15, ei_iso8859_15
157 -ISO-8859-16, ei_iso8859_16
158 -ISO_8859-16, ei_iso8859_16
159 -ISO_8859-16:2001, ei_iso8859_16
160 -ISO-IR-226, ei_iso8859_16
161 -LATIN10, ei_iso8859_16
163 -ISO8859-16, ei_iso8859_16
169 WINDOWS-1250, ei_cp1250
172 -WINDOWS-1251, ei_cp1251
175 -WINDOWS-1252, ei_cp1252
178 -WINDOWS-1253, ei_cp1253
181 -WINDOWS-1254, ei_cp1254
184 -WINDOWS-1255, ei_cp1255
187 -WINDOWS-1256, ei_cp1256
190 -WINDOWS-1257, ei_cp1257
191 -WINBALTRIM, ei_cp1257
193 -WINDOWS-1258, ei_cp1258
197 -CSPC850MULTILINGUAL, ei_cp850
201 -CSPC862LATINHEBREW, ei_cp862
206 -MACROMAN, ei_mac_roman
207 -MACINTOSH, ei_mac_roman
209 -CSMACINTOSH, ei_mac_roman
210 -MACCENTRALEUROPE, ei_mac_centraleurope
211 -MACICELAND, ei_mac_iceland
212 -MACCROATIAN, ei_mac_croatian
213 -MACROMANIA, ei_mac_romania
214 -MACCYRILLIC, ei_mac_cyrillic
215 -MACUKRAINE, ei_mac_ukraine
216 -MACGREEK, ei_mac_greek
217 -MACTURKISH, ei_mac_turkish
218 -MACHEBREW, ei_mac_hebrew
219 -MACARABIC, ei_mac_arabic
220 -MACTHAI, ei_mac_thai
221 -HP-ROMAN8, ei_hp_roman8
222 -ROMAN8, ei_hp_roman8
224 -CSHPROMAN8, ei_hp_roman8
225 -NEXTSTEP, ei_nextstep
226 -ARMSCII-8, ei_armscii_8
227 -GEORGIAN-ACADEMY, ei_georgian_academy
228 -GEORGIAN-PS, ei_georgian_ps
233 -CYRILLIC-ASIAN, ei_pt154
235 -MULELAO-1, ei_mulelao
237 -IBM-CP1133, ei_cp1133
241 -TIS620.2529-1, ei_tis620
242 -TIS620.2533-0, ei_tis620
243 -TIS620.2533-1, ei_tis620
244 -ISO-IR-166, ei_tis620
246 -WINDOWS-874, ei_cp874
248 -VISCII1.1-1, ei_viscii
253 -TCVN5712-1:1993, ei_tcvn
254 -JIS_C6220-1969-RO, ei_iso646_jp
255 -ISO646-JP, ei_iso646_jp
256 -ISO-IR-14, ei_iso646_jp
258 -CSISO14JISC6220RO, ei_iso646_jp
259 -JIS_X0201, ei_jisx0201
260 -JISX0201-1976, ei_jisx0201
262 -CSHALFWIDTHKATAKANA, ei_jisx0201
263 -JIS_X0208, ei_jisx0208
264 -JIS_X0208-1983, ei_jisx0208
265 -JIS_X0208-1990, ei_jisx0208
266 -JIS0208, ei_jisx0208
268 -ISO-IR-87, ei_jisx0208
269 -JIS_C6226-1983, ei_jisx0208
270 -CSISO87JISX0208, ei_jisx0208
271 -JIS_X0212, ei_jisx0212
272 -JIS_X0212.1990-0, ei_jisx0212
273 -JIS_X0212-1990, ei_jisx0212
275 -ISO-IR-159, ei_jisx0212
276 -CSISO159JISX02121990, ei_jisx0212
277 -GB_1988-80, ei_iso646_cn
278 -ISO646-CN, ei_iso646_cn
279 -ISO-IR-57, ei_iso646_cn
281 -CSISO57GB1988, ei_iso646_cn
282 -GB_2312-80, ei_gb2312
283 -ISO-IR-58, ei_gb2312
284 -CSISO58GB231280, ei_gb2312
286 -ISO-IR-165, ei_isoir165
287 -CN-GB-ISOIR165, ei_isoir165
288 -KSC_5601, ei_ksc5601
289 -KS_C_5601-1987, ei_ksc5601
290 -KS_C_5601-1989, ei_ksc5601
291 -ISO-IR-149, ei_ksc5601
292 -CSKSC56011987, ei_ksc5601
296 -EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE, ei_euc_jp
297 -CSEUCPKDFMTJAPANESE, ei_euc_jp
304 -ISO-2022-JP, ei_iso2022_jp
305 -CSISO2022JP, ei_iso2022_jp
306 -ISO-2022-JP-1, ei_iso2022_jp1
307 -ISO-2022-JP-2, ei_iso2022_jp2
308 -CSISO2022JP2, ei_iso2022_jp2
317 -WINDOWS-936, ei_cp936
319 -ISO-2022-CN, ei_iso2022_cn
320 -CSISO2022CN, ei_iso2022_cn
321 -ISO-2022-CN-EXT, ei_iso2022_cn_ext
329 -BIG-FIVE, ei_ces_big5
330 -BIGFIVE, ei_ces_big5
331 -CN-BIG5, ei_ces_big5
334 -BIG5-HKSCS:1999, ei_big5hkscs1999
335 -BIG5-HKSCS:2001, ei_big5hkscs2001
336 -BIG5-HKSCS, ei_big5hkscs2004
337 -BIG5HKSCS, ei_big5hkscs2004
338 -BIG5-HKSCS:2004, ei_big5hkscs2004
346 -ISO-2022-KR, ei_iso2022_kr
347 -CSISO2022KR, ei_iso2022_kr
349 WCHAR_T, ei_local_wchar_t
350 diff -urN libiconv-1.11.old/lib/aliases.h libiconv-1.11.new/lib/aliases.h
351 --- libiconv-1.11.old/lib/aliases.h 2006-05-18 14:45:18.000000000 +0200
352 +++ libiconv-1.11.new/lib/aliases.h 2007-11-11 14:39:47.000000000 +0100
354 /* ANSI-C code produced by gperf version 3.0.2 */
355 /* Command-line: gperf -m 10 lib/aliases.gperf */
356 -/* Computed positions: -k'1,3-11,$' */
357 +/* Computed positions: -k'4-7,10,$' */
359 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
360 && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
362 #line 1 "lib/aliases.gperf"
363 struct alias { int name; unsigned int encoding_index; };
365 -#define TOTAL_KEYWORDS 341
366 +#define TOTAL_KEYWORDS 70
367 #define MIN_WORD_LENGTH 2
368 -#define MAX_WORD_LENGTH 45
369 -#define MIN_HASH_VALUE 13
370 -#define MAX_HASH_VALUE 997
371 -/* maximum key range = 985, duplicates = 0 */
372 +#define MAX_WORD_LENGTH 17
373 +#define MIN_HASH_VALUE 4
374 +#define MAX_HASH_VALUE 98
375 +/* maximum key range = 95, duplicates = 0 */
381 aliases_hash (register const char *str, register unsigned int len)
383 - static const unsigned short asso_values[] =
384 + static const unsigned char asso_values[] =
386 - 998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
387 - 998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
388 - 998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
389 - 998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
390 - 998, 998, 998, 998, 998, 4, 199, 998, 79, 6,
391 - 29, 65, 13, 15, 4, 88, 20, 22, 386, 998,
392 - 998, 998, 998, 998, 998, 47, 188, 110, 6, 26,
393 - 63, 19, 12, 5, 281, 202, 7, 166, 11, 5,
394 - 64, 998, 4, 11, 20, 185, 110, 152, 163, 4,
395 - 4, 998, 998, 998, 998, 5, 998, 998, 998, 998,
396 - 998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
397 - 998, 998, 998, 998, 998, 998, 998, 998, 998, 998,
398 - 998, 998, 998, 998, 998, 998, 998, 998
399 + 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
400 + 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
401 + 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
402 + 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
403 + 99, 99, 99, 99, 99, 6, 99, 99, 22, 3,
404 + 2, 2, 17, 3, 2, 7, 3, 2, 99, 99,
405 + 99, 99, 99, 99, 99, 4, 53, 2, 21, 2,
406 + 99, 7, 99, 15, 99, 99, 19, 99, 33, 2,
407 + 4, 99, 11, 26, 17, 99, 99, 3, 26, 99,
408 + 99, 99, 99, 99, 99, 10, 99, 99, 99, 99,
409 + 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
410 + 99, 99, 99, 99, 99, 99, 99, 99, 99, 99,
411 + 99, 99, 99, 99, 99, 99, 99, 99
413 register int hval = len;
418 - hval += asso_values[(unsigned char)str[10]];
421 hval += asso_values[(unsigned char)str[9]];
424 - hval += asso_values[(unsigned char)str[8]];
427 - hval += asso_values[(unsigned char)str[7]];
430 hval += asso_values[(unsigned char)str[6]];
433 hval += asso_values[(unsigned char)str[3]];
436 - hval += asso_values[(unsigned char)str[2]];
440 - hval += asso_values[(unsigned char)str[0]];
443 return hval + asso_values[(unsigned char)str[len - 1]];
444 @@ -106,1576 +95,306 @@
448 - char stringpool_str13[sizeof("L6")];
449 - char stringpool_str15[sizeof("L1")];
450 - char stringpool_str18[sizeof("HZ")];
451 - char stringpool_str22[sizeof("L4")];
452 - char stringpool_str24[sizeof("L5")];
453 - char stringpool_str26[sizeof("R8")];
454 - char stringpool_str29[sizeof("L8")];
455 - char stringpool_str31[sizeof("866")];
456 - char stringpool_str38[sizeof("L2")];
457 - char stringpool_str42[sizeof("SJIS")];
458 - char stringpool_str43[sizeof("ISO-IR-6")];
459 - char stringpool_str55[sizeof("ISO-IR-166")];
460 - char stringpool_str57[sizeof("LATIN6")];
461 - char stringpool_str61[sizeof("LATIN1")];
462 - char stringpool_str68[sizeof("ISO-IR-14")];
463 - char stringpool_str74[sizeof("L3")];
464 - char stringpool_str75[sizeof("LATIN4")];
465 - char stringpool_str77[sizeof("ISO-IR-165")];
466 - char stringpool_str79[sizeof("LATIN5")];
467 - char stringpool_str80[sizeof("ISO-IR-126")];
468 - char stringpool_str81[sizeof("862")];
469 - char stringpool_str82[sizeof("ISO-IR-144")];
470 - char stringpool_str89[sizeof("LATIN8")];
471 - char stringpool_str91[sizeof("ISO-IR-58")];
472 - char stringpool_str96[sizeof("ISO-IR-148")];
473 - char stringpool_str97[sizeof("L7")];
474 - char stringpool_str98[sizeof("LATIN-9")];
475 - char stringpool_str100[sizeof("ISO-IR-149")];
476 - char stringpool_str102[sizeof("ISO-IR-159")];
477 - char stringpool_str103[sizeof("ISO-IR-226")];
478 - char stringpool_str107[sizeof("LATIN2")];
479 - char stringpool_str108[sizeof("ISO8859-6")];
480 - char stringpool_str109[sizeof("ISO-IR-199")];
481 - char stringpool_str112[sizeof("ISO8859-1")];
482 - char stringpool_str113[sizeof("ISO-8859-6")];
483 - char stringpool_str114[sizeof("ISO_8859-6")];
484 - char stringpool_str115[sizeof("ISO8859-16")];
485 - char stringpool_str116[sizeof("PT154")];
486 - char stringpool_str117[sizeof("ISO-8859-1")];
487 - char stringpool_str118[sizeof("ISO_8859-1")];
488 - char stringpool_str119[sizeof("ISO8859-11")];
489 - char stringpool_str120[sizeof("ISO-8859-16")];
490 - char stringpool_str121[sizeof("ISO_8859-16")];
491 - char stringpool_str123[sizeof("CN")];
492 - char stringpool_str124[sizeof("ISO-8859-11")];
493 - char stringpool_str125[sizeof("ISO_8859-11")];
494 - char stringpool_str126[sizeof("ISO8859-4")];
495 - char stringpool_str128[sizeof("ISO_8859-16:2001")];
496 - char stringpool_str130[sizeof("ISO8859-5")];
497 - char stringpool_str131[sizeof("ISO-8859-4")];
498 - char stringpool_str132[sizeof("ISO_8859-4")];
499 - char stringpool_str133[sizeof("ISO8859-14")];
500 - char stringpool_str134[sizeof("ISO-IR-101")];
501 - char stringpool_str135[sizeof("ISO-8859-5")];
502 - char stringpool_str136[sizeof("ISO_8859-5")];
503 - char stringpool_str137[sizeof("ISO8859-15")];
504 - char stringpool_str138[sizeof("ISO-8859-14")];
505 - char stringpool_str139[sizeof("ISO_8859-14")];
506 - char stringpool_str140[sizeof("ISO8859-8")];
507 - char stringpool_str142[sizeof("ISO-8859-15")];
508 - char stringpool_str143[sizeof("ISO_8859-15")];
509 - char stringpool_str144[sizeof("ISO8859-9")];
510 - char stringpool_str145[sizeof("ISO-8859-8")];
511 - char stringpool_str146[sizeof("ISO_8859-8")];
512 - char stringpool_str147[sizeof("CP866")];
513 - char stringpool_str148[sizeof("ISO-IR-138")];
514 - char stringpool_str149[sizeof("ISO-8859-9")];
515 - char stringpool_str150[sizeof("ISO_8859-9")];
516 - char stringpool_str151[sizeof("ISO_8859-14:1998")];
517 - char stringpool_str153[sizeof("ISO_8859-15:1998")];
518 - char stringpool_str155[sizeof("ELOT_928")];
519 - char stringpool_str156[sizeof("TCVN")];
520 - char stringpool_str157[sizeof("C99")];
521 - char stringpool_str158[sizeof("ISO8859-2")];
522 - char stringpool_str162[sizeof("CP154")];
523 - char stringpool_str163[sizeof("ISO-8859-2")];
524 - char stringpool_str164[sizeof("ISO_8859-2")];
525 - char stringpool_str166[sizeof("ISO-IR-109")];
526 - char stringpool_str168[sizeof("L10")];
527 - char stringpool_str169[sizeof("CHAR")];
528 - char stringpool_str174[sizeof("CP1256")];
529 - char stringpool_str175[sizeof("ISO-IR-179")];
530 - char stringpool_str176[sizeof("ISO646-CN")];
531 - char stringpool_str177[sizeof("ASCII")];
532 - char stringpool_str178[sizeof("CP1251")];
533 - char stringpool_str179[sizeof("LATIN3")];
534 - char stringpool_str181[sizeof("850")];
535 - char stringpool_str183[sizeof("GB2312")];
536 - char stringpool_str185[sizeof("CP819")];
537 - char stringpool_str192[sizeof("CP1254")];
538 - char stringpool_str194[sizeof("CP949")];
539 - char stringpool_str196[sizeof("CP1255")];
540 - char stringpool_str197[sizeof("CP862")];
541 - char stringpool_str198[sizeof("US")];
542 - char stringpool_str203[sizeof("CP1361")];
543 - char stringpool_str206[sizeof("CP1258")];
544 - char stringpool_str207[sizeof("ISO-IR-110")];
545 - char stringpool_str209[sizeof("IBM866")];
546 - char stringpool_str210[sizeof("CP936")];
547 - char stringpool_str211[sizeof("GEORGIAN-PS")];
548 - char stringpool_str214[sizeof("LATIN10")];
549 - char stringpool_str222[sizeof("CHINESE")];
550 - char stringpool_str224[sizeof("CP1252")];
551 - char stringpool_str225[sizeof("LATIN7")];
552 - char stringpool_str226[sizeof("ISO_8859-10:1992")];
553 - char stringpool_str227[sizeof("ISO-IR-57")];
554 - char stringpool_str228[sizeof("TIS620")];
555 - char stringpool_str230[sizeof("ISO8859-3")];
556 - char stringpool_str231[sizeof("UCS-4")];
557 - char stringpool_str232[sizeof("ISO-IR-87")];
558 - char stringpool_str233[sizeof("TIS-620")];
559 - char stringpool_str234[sizeof("ISO-IR-157")];
560 - char stringpool_str235[sizeof("ISO-8859-3")];
561 - char stringpool_str236[sizeof("ISO_8859-3")];
562 - char stringpool_str237[sizeof("ISO8859-13")];
563 - char stringpool_str240[sizeof("CSISOLATIN6")];
564 - char stringpool_str241[sizeof("BIG5")];
565 - char stringpool_str242[sizeof("ISO-8859-13")];
566 - char stringpool_str243[sizeof("ISO_8859-13")];
567 - char stringpool_str244[sizeof("CSISOLATIN1")];
568 - char stringpool_str245[sizeof("KOI8-R")];
569 - char stringpool_str246[sizeof("BIG-5")];
570 - char stringpool_str247[sizeof("IBM819")];
571 - char stringpool_str248[sizeof("ISO-IR-127")];
572 - char stringpool_str249[sizeof("CP874")];
573 - char stringpool_str251[sizeof("ISO646-US")];
574 - char stringpool_str252[sizeof("VISCII")];
575 - char stringpool_str253[sizeof("MS-EE")];
576 - char stringpool_str256[sizeof("MS-ANSI")];
577 - char stringpool_str258[sizeof("CSISOLATIN4")];
578 - char stringpool_str259[sizeof("IBM862")];
579 - char stringpool_str260[sizeof("CP932")];
580 - char stringpool_str261[sizeof("X0212")];
581 - char stringpool_str262[sizeof("CSISOLATIN5")];
582 - char stringpool_str263[sizeof("UCS-2")];
583 - char stringpool_str265[sizeof("ISO8859-10")];
584 - char stringpool_str266[sizeof("MS936")];
585 - char stringpool_str267[sizeof("WCHAR_T")];
586 - char stringpool_str270[sizeof("ISO-8859-10")];
587 - char stringpool_str271[sizeof("ISO_8859-10")];
588 - char stringpool_str272[sizeof("UTF-16")];
589 - char stringpool_str273[sizeof("EUCCN")];
590 - char stringpool_str274[sizeof("ROMAN8")];
591 - char stringpool_str275[sizeof("ISO-IR-203")];
592 - char stringpool_str276[sizeof("ISO8859-7")];
593 - char stringpool_str277[sizeof("KOI8-T")];
594 - char stringpool_str278[sizeof("EUC-CN")];
595 - char stringpool_str279[sizeof("UCS-4LE")];
596 - char stringpool_str280[sizeof("ISO-IR-100")];
597 - char stringpool_str281[sizeof("ISO-8859-7")];
598 - char stringpool_str282[sizeof("ISO_8859-7")];
599 - char stringpool_str283[sizeof("MULELAO-1")];
600 - char stringpool_str284[sizeof("GB_1988-80")];
601 - char stringpool_str288[sizeof("X0201")];
602 - char stringpool_str289[sizeof("ECMA-114")];
603 - char stringpool_str290[sizeof("CSISOLATIN2")];
604 - char stringpool_str291[sizeof("GEORGIAN-ACADEMY")];
605 - char stringpool_str292[sizeof("PTCP154")];
606 - char stringpool_str295[sizeof("UCS-2LE")];
607 - char stringpool_str296[sizeof("CP1253")];
608 - char stringpool_str297[sizeof("UTF-8")];
609 - char stringpool_str298[sizeof("HP-ROMAN8")];
610 - char stringpool_str300[sizeof("CSASCII")];
611 - char stringpool_str303[sizeof("ECMA-118")];
612 - char stringpool_str304[sizeof("UCS-4-INTERNAL")];
613 - char stringpool_str305[sizeof("TCVN5712-1")];
614 - char stringpool_str307[sizeof("KOREAN")];
615 - char stringpool_str308[sizeof("CP850")];
616 - char stringpool_str309[sizeof("MS-CYRL")];
617 - char stringpool_str310[sizeof("CP950")];
618 - char stringpool_str313[sizeof("TIS620-0")];
619 - char stringpool_str316[sizeof("X0208")];
620 - char stringpool_str319[sizeof("GREEK8")];
621 - char stringpool_str320[sizeof("UCS-2-INTERNAL")];
622 - char stringpool_str321[sizeof("TCVN-5712")];
623 - char stringpool_str323[sizeof("CP1133")];
624 - char stringpool_str324[sizeof("CP1250")];
625 - char stringpool_str327[sizeof("ISO-2022-CN")];
626 - char stringpool_str329[sizeof("UTF-16LE")];
627 - char stringpool_str335[sizeof("CYRILLIC-ASIAN")];
628 - char stringpool_str337[sizeof("ISO-10646-UCS-4")];
629 - char stringpool_str340[sizeof("ISO-2022-CN-EXT")];
630 - char stringpool_str342[sizeof("CP1257")];
631 - char stringpool_str345[sizeof("GB_2312-80")];
632 - char stringpool_str347[sizeof("JP")];
633 - char stringpool_str351[sizeof("EUCKR")];
634 - char stringpool_str353[sizeof("ISO-10646-UCS-2")];
635 - char stringpool_str354[sizeof("GB18030")];
636 - char stringpool_str356[sizeof("EUC-KR")];
637 - char stringpool_str357[sizeof("CSKOI8R")];
638 - char stringpool_str358[sizeof("CSBIG5")];
639 - char stringpool_str360[sizeof("CP367")];
640 - char stringpool_str361[sizeof("MACINTOSH")];
641 - char stringpool_str362[sizeof("CSISOLATIN3")];
642 - char stringpool_str363[sizeof("CN-BIG5")];
643 - char stringpool_str366[sizeof("CYRILLIC")];
644 - char stringpool_str369[sizeof("CSVISCII")];
645 - char stringpool_str370[sizeof("IBM850")];
646 - char stringpool_str372[sizeof("MACTHAI")];
647 - char stringpool_str374[sizeof("UNICODE-1-1")];
648 - char stringpool_str376[sizeof("ISO_646.IRV:1991")];
649 - char stringpool_str380[sizeof("US-ASCII")];
650 - char stringpool_str381[sizeof("UTF-32")];
651 - char stringpool_str384[sizeof("CN-GB-ISOIR165")];
652 - char stringpool_str387[sizeof("NEXTSTEP")];
653 - char stringpool_str389[sizeof("MAC")];
654 - char stringpool_str393[sizeof("EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE")];
655 - char stringpool_str394[sizeof("CSISOLATINARABIC")];
656 - char stringpool_str395[sizeof("HZ-GB-2312")];
657 - char stringpool_str397[sizeof("ARMSCII-8")];
658 - char stringpool_str401[sizeof("CSISOLATINHEBREW")];
659 - char stringpool_str405[sizeof("ISO-2022-KR")];
660 - char stringpool_str407[sizeof("WINDOWS-1256")];
661 - char stringpool_str408[sizeof("UHC")];
662 - char stringpool_str409[sizeof("WINDOWS-1251")];
663 - char stringpool_str411[sizeof("MS-HEBR")];
664 - char stringpool_str412[sizeof("ISO-CELTIC")];
665 - char stringpool_str413[sizeof("UTF-32LE")];
666 - char stringpool_str416[sizeof("WINDOWS-1254")];
667 - char stringpool_str418[sizeof("WINDOWS-1255")];
668 - char stringpool_str420[sizeof("SHIFT-JIS")];
669 - char stringpool_str421[sizeof("SHIFT_JIS")];
670 - char stringpool_str422[sizeof("IBM367")];
671 - char stringpool_str423[sizeof("WINDOWS-1258")];
672 - char stringpool_str424[sizeof("CSPTCP154")];
673 - char stringpool_str426[sizeof("GBK")];
674 - char stringpool_str428[sizeof("UNICODELITTLE")];
675 - char stringpool_str432[sizeof("WINDOWS-1252")];
676 - char stringpool_str433[sizeof("UTF-7")];
677 - char stringpool_str435[sizeof("KSC_5601")];
678 - char stringpool_str437[sizeof("ASMO-708")];
679 - char stringpool_str440[sizeof("CSISO2022CN")];
680 - char stringpool_str444[sizeof("BIGFIVE")];
681 - char stringpool_str447[sizeof("WINDOWS-936")];
682 - char stringpool_str448[sizeof("CSUCS4")];
683 - char stringpool_str449[sizeof("BIG-FIVE")];
684 - char stringpool_str453[sizeof("ISO646-JP")];
685 - char stringpool_str456[sizeof("TIS620.2529-1")];
686 - char stringpool_str457[sizeof("CSISOLATINGREEK")];
687 - char stringpool_str459[sizeof("CSISOLATINCYRILLIC")];
688 - char stringpool_str460[sizeof("UCS-4BE")];
689 - char stringpool_str462[sizeof("UNICODE-1-1-UTF-7")];
690 - char stringpool_str465[sizeof("EUCTW")];
691 - char stringpool_str468[sizeof("WINDOWS-1253")];
692 - char stringpool_str469[sizeof("CSHPROMAN8")];
693 - char stringpool_str470[sizeof("EUC-TW")];
694 - char stringpool_str472[sizeof("KS_C_5601-1989")];
695 - char stringpool_str476[sizeof("UCS-2BE")];
696 - char stringpool_str479[sizeof("VISCII1.1-1")];
697 - char stringpool_str480[sizeof("GREEK")];
698 - char stringpool_str482[sizeof("WINDOWS-1250")];
699 - char stringpool_str483[sizeof("CSGB2312")];
700 - char stringpool_str486[sizeof("WINDOWS-874")];
701 - char stringpool_str487[sizeof("CSUNICODE11")];
702 - char stringpool_str489[sizeof("JAVA")];
703 - char stringpool_str491[sizeof("WINDOWS-1257")];
704 - char stringpool_str493[sizeof("CSUNICODE")];
705 - char stringpool_str500[sizeof("CSHALFWIDTHKATAKANA")];
706 - char stringpool_str502[sizeof("CSISO57GB1988")];
707 - char stringpool_str504[sizeof("MACICELAND")];
708 - char stringpool_str509[sizeof("CSIBM866")];
709 - char stringpool_str510[sizeof("UTF-16BE")];
710 - char stringpool_str513[sizeof("ARABIC")];
711 - char stringpool_str514[sizeof("CN-GB")];
712 - char stringpool_str518[sizeof("CSISO2022KR")];
713 - char stringpool_str520[sizeof("CSMACINTOSH")];
714 - char stringpool_str526[sizeof("JIS0208")];
715 - char stringpool_str528[sizeof("MACROMAN")];
716 - char stringpool_str530[sizeof("ISO_8859-4:1988")];
717 - char stringpool_str532[sizeof("ISO_8859-5:1988")];
718 - char stringpool_str535[sizeof("TIS620.2533-1")];
719 - char stringpool_str536[sizeof("ANSI_X3.4-1986")];
720 - char stringpool_str537[sizeof("ISO_8859-8:1988")];
721 - char stringpool_str538[sizeof("KS_C_5601-1987")];
722 - char stringpool_str539[sizeof("CSSHIFTJIS")];
723 - char stringpool_str540[sizeof("HEBREW")];
724 - char stringpool_str541[sizeof("ISO_8859-9:1989")];
725 - char stringpool_str547[sizeof("MACCROATIAN")];
726 - char stringpool_str548[sizeof("ISO-2022-JP-1")];
727 - char stringpool_str550[sizeof("EUCJP")];
728 - char stringpool_str552[sizeof("ANSI_X3.4-1968")];
729 - char stringpool_str555[sizeof("EUC-JP")];
730 - char stringpool_str561[sizeof("CSISO58GB231280")];
731 - char stringpool_str562[sizeof("JIS_C6226-1983")];
732 - char stringpool_str566[sizeof("IBM-CP1133")];
733 - char stringpool_str569[sizeof("MACCENTRALEUROPE")];
734 - char stringpool_str570[sizeof("CSISO159JISX02121990")];
735 - char stringpool_str571[sizeof("ISO-2022-JP-2")];
736 - char stringpool_str573[sizeof("CSUNICODE11UTF7")];
737 - char stringpool_str574[sizeof("UCS-4-SWAPPED")];
738 - char stringpool_str578[sizeof("UNICODEBIG")];
739 - char stringpool_str579[sizeof("CSISO14JISC6220RO")];
740 - char stringpool_str580[sizeof("JIS_C6220-1969-RO")];
741 - char stringpool_str582[sizeof("ISO_8859-3:1988")];
742 - char stringpool_str586[sizeof("CSPC862LATINHEBREW")];
743 - char stringpool_str588[sizeof("BIG5HKSCS")];
744 - char stringpool_str589[sizeof("ISO_8859-6:1987")];
745 - char stringpool_str590[sizeof("UCS-2-SWAPPED")];
746 - char stringpool_str591[sizeof("ISO_8859-1:1987")];
747 - char stringpool_str593[sizeof("BIG5-HKSCS")];
748 - char stringpool_str594[sizeof("UTF-32BE")];
749 - char stringpool_str604[sizeof("ISO-2022-JP")];
750 - char stringpool_str607[sizeof("KOI8-U")];
751 - char stringpool_str608[sizeof("TIS620.2533-0")];
752 - char stringpool_str612[sizeof("KOI8-RU")];
753 - char stringpool_str614[sizeof("ISO_8859-2:1987")];
754 - char stringpool_str618[sizeof("MACROMANIA")];
755 - char stringpool_str641[sizeof("JIS_X0212")];
756 - char stringpool_str648[sizeof("CSEUCKR")];
757 - char stringpool_str649[sizeof("MACCYRILLIC")];
758 - char stringpool_str650[sizeof("ISO_8859-7:2003")];
759 - char stringpool_str651[sizeof("MS-ARAB")];
760 - char stringpool_str657[sizeof("MS-GREEK")];
761 - char stringpool_str666[sizeof("CSKSC56011987")];
762 - char stringpool_str668[sizeof("JIS_X0201")];
763 - char stringpool_str673[sizeof("ISO_8859-7:1987")];
764 - char stringpool_str683[sizeof("CSISO2022JP2")];
765 - char stringpool_str696[sizeof("JIS_X0208")];
766 - char stringpool_str697[sizeof("JISX0201-1976")];
767 - char stringpool_str706[sizeof("JIS_X0212-1990")];
768 - char stringpool_str717[sizeof("CSISO2022JP")];
769 - char stringpool_str721[sizeof("JOHAB")];
770 - char stringpool_str730[sizeof("MS_KANJI")];
771 - char stringpool_str734[sizeof("CSISO87JISX0208")];
772 - char stringpool_str737[sizeof("MACTURKISH")];
773 - char stringpool_str755[sizeof("TCVN5712-1:1993")];
774 - char stringpool_str756[sizeof("JIS_X0208-1983")];
775 - char stringpool_str762[sizeof("CSEUCTW")];
776 - char stringpool_str763[sizeof("MACGREEK")];
777 - char stringpool_str770[sizeof("JIS_X0208-1990")];
778 - char stringpool_str776[sizeof("WINBALTRIM")];
779 - char stringpool_str790[sizeof("MS-TURK")];
780 - char stringpool_str792[sizeof("MACUKRAINE")];
781 - char stringpool_str796[sizeof("MACARABIC")];
782 - char stringpool_str802[sizeof("CSPC850MULTILINGUAL")];
783 - char stringpool_str845[sizeof("MACHEBREW")];
784 - char stringpool_str903[sizeof("JIS_X0212.1990-0")];
785 - char stringpool_str979[sizeof("BIG5-HKSCS:2001")];
786 - char stringpool_str986[sizeof("BIG5-HKSCS:2004")];
787 - char stringpool_str995[sizeof("BIG5-HKSCS:1999")];
788 - char stringpool_str997[sizeof("CSEUCPKDFMTJAPANESE")];
789 + char stringpool_str4[sizeof("L2")];
790 + char stringpool_str5[sizeof("L1")];
791 + char stringpool_str11[sizeof("MS-EE")];
792 + char stringpool_str12[sizeof("CP819")];
793 + char stringpool_str15[sizeof("UCS-2")];
794 + char stringpool_str16[sizeof("IBM819")];
795 + char stringpool_str17[sizeof("UTF-8")];
796 + char stringpool_str18[sizeof("UTF-32")];
797 + char stringpool_str19[sizeof("UTF-16")];
798 + char stringpool_str21[sizeof("CP367")];
799 + char stringpool_str22[sizeof("ISO8859-2")];
800 + char stringpool_str23[sizeof("ISO8859-1")];
801 + char stringpool_str24[sizeof("IBM367")];
802 + char stringpool_str25[sizeof("UTF-7")];
803 + char stringpool_str26[sizeof("CHAR")];
804 + char stringpool_str27[sizeof("ISO8859-15")];
805 + char stringpool_str28[sizeof("US")];
806 + char stringpool_str29[sizeof("ISO-8859-2")];
807 + char stringpool_str31[sizeof("ISO-8859-1")];
808 + char stringpool_str32[sizeof("ISO-8859-15")];
809 + char stringpool_str33[sizeof("ISO_8859-2")];
810 + char stringpool_str35[sizeof("ISO_8859-1")];
811 + char stringpool_str36[sizeof("ISO_8859-15")];
812 + char stringpool_str37[sizeof("KOI8-R")];
813 + char stringpool_str38[sizeof("UCS-2LE")];
814 + char stringpool_str39[sizeof("UTF-32LE")];
815 + char stringpool_str40[sizeof("UTF-16LE")];
816 + char stringpool_str41[sizeof("ISO_8859-15:1998")];
817 + char stringpool_str43[sizeof("ISO_8859-2:1987")];
818 + char stringpool_str44[sizeof("ISO_8859-1:1987")];
819 + char stringpool_str45[sizeof("UCS-4")];
820 + char stringpool_str47[sizeof("UNICODE-1-1")];
821 + char stringpool_str48[sizeof("ISO-IR-6")];
822 + char stringpool_str49[sizeof("CSKOI8R")];
823 + char stringpool_str50[sizeof("ASCII")];
824 + char stringpool_str51[sizeof("UNICODEBIG")];
825 + char stringpool_str52[sizeof("ISO-IR-203")];
826 + char stringpool_str53[sizeof("UCS-4LE")];
827 + char stringpool_str54[sizeof("ISO-IR-101")];
828 + char stringpool_str55[sizeof("CP1250")];
829 + char stringpool_str56[sizeof("ISO-10646-UCS-2")];
830 + char stringpool_str57[sizeof("UNICODE-1-1-UTF-7")];
831 + char stringpool_str58[sizeof("LATIN2")];
832 + char stringpool_str59[sizeof("UNICODELITTLE")];
833 + char stringpool_str60[sizeof("LATIN1")];
834 + char stringpool_str61[sizeof("ISO_646.IRV:1991")];
835 + char stringpool_str62[sizeof("ISO646-US")];
836 + char stringpool_str63[sizeof("CSUNICODE")];
837 + char stringpool_str64[sizeof("UCS-2-INTERNAL")];
838 + char stringpool_str65[sizeof("LATIN-9")];
839 + char stringpool_str66[sizeof("WCHAR_T")];
840 + char stringpool_str68[sizeof("CSUCS4")];
841 + char stringpool_str69[sizeof("CSUNICODE11")];
842 + char stringpool_str70[sizeof("US-ASCII")];
843 + char stringpool_str71[sizeof("ISO-10646-UCS-4")];
844 + char stringpool_str72[sizeof("UCS-2BE")];
845 + char stringpool_str73[sizeof("UTF-32BE")];
846 + char stringpool_str74[sizeof("UTF-16BE")];
847 + char stringpool_str75[sizeof("ANSI_X3.4-1986")];
848 + char stringpool_str76[sizeof("ANSI_X3.4-1968")];
849 + char stringpool_str77[sizeof("CSUNICODE11UTF7")];
850 + char stringpool_str78[sizeof("UCS-2-SWAPPED")];
851 + char stringpool_str79[sizeof("UCS-4-INTERNAL")];
852 + char stringpool_str80[sizeof("CSASCII")];
853 + char stringpool_str87[sizeof("UCS-4BE")];
854 + char stringpool_str88[sizeof("WINDOWS-1250")];
855 + char stringpool_str92[sizeof("ISO-IR-100")];
856 + char stringpool_str93[sizeof("UCS-4-SWAPPED")];
857 + char stringpool_str97[sizeof("CSISOLATIN2")];
858 + char stringpool_str98[sizeof("CSISOLATIN1")];
860 static const struct stringpool_t stringpool_contents =
919 - "ISO_8859-16:2001",
948 - "ISO_8859-14:1998",
988 - "ISO_8859-10:1992",
1047 - "GEORGIAN-ACADEMY",
1072 - "ISO-10646-UCS-4",
1073 - "ISO-2022-CN-EXT",
1092 - "ISO_646.IRV:1991",
1098 - "EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE",
1099 - "CSISOLATINARABIC",
1102 - "CSISOLATINHEBREW",
1118 + "UNICODE-1-1-UTF-7",
1129 + "ISO_646.IRV:1991",
1139 - "CSISOLATINGREEK",
1140 - "CSISOLATINCYRILLIC",
1142 - "UNICODE-1-1-UTF-7",
1158 - "CSHALFWIDTHKATAKANA",
1163 + "ISO-10646-UCS-4",
1173 - "ISO_8859-4:1988",
1174 - "ISO_8859-5:1988",
1177 - "ISO_8859-8:1988",
1181 - "ISO_8859-9:1989",
1187 - "CSISO58GB231280",
1190 - "MACCENTRALEUROPE",
1191 - "CSISO159JISX02121990",
1196 - "CSISO14JISC6220RO",
1197 - "JIS_C6220-1969-RO",
1198 - "ISO_8859-3:1988",
1199 - "CSPC862LATINHEBREW",
1201 - "ISO_8859-6:1987",
1203 - "ISO_8859-1:1987",
1210 - "ISO_8859-2:1987",
1215 - "ISO_8859-7:2003",
1220 - "ISO_8859-7:1987",
1228 - "CSISO87JISX0208",
1230 - "TCVN5712-1:1993",
1239 - "CSPC850MULTILINGUAL",
1241 - "JIS_X0212.1990-0",
1242 - "BIG5-HKSCS:2001",
1243 - "BIG5-HKSCS:2004",
1244 - "BIG5-HKSCS:1999",
1245 - "CSEUCPKDFMTJAPANESE"
1255 #define stringpool ((const char *) &stringpool_contents)
1257 static const struct alias aliases[] =
1259 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1260 {-1}, {-1}, {-1}, {-1},
1261 -#line 134 "lib/aliases.gperf"
1262 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, ei_iso8859_10},
1264 -#line 60 "lib/aliases.gperf"
1265 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_iso8859_1},
1267 -#line 325 "lib/aliases.gperf"
1268 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, ei_hz},
1270 -#line 84 "lib/aliases.gperf"
1271 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, ei_iso8859_4},
1273 -#line 126 "lib/aliases.gperf"
1274 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, ei_iso8859_9},
1276 -#line 226 "lib/aliases.gperf"
1277 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, ei_hp_roman8},
1279 -#line 151 "lib/aliases.gperf"
1280 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, ei_iso8859_14},
1282 -#line 207 "lib/aliases.gperf"
1283 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, ei_cp866},
1284 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1285 -#line 68 "lib/aliases.gperf"
1286 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, ei_iso8859_2},
1288 -#line 303 "lib/aliases.gperf"
1289 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, ei_sjis},
1290 -#line 16 "lib/aliases.gperf"
1291 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_ascii},
1292 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1294 -#line 247 "lib/aliases.gperf"
1295 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str55, ei_tis620},
1297 -#line 133 "lib/aliases.gperf"
1298 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str57, ei_iso8859_10},
1300 -#line 59 "lib/aliases.gperf"
1301 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str61, ei_iso8859_1},
1302 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1303 -#line 259 "lib/aliases.gperf"
1304 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str68, ei_iso646_jp},
1305 +#line 66 "lib/aliases.gperf"
1306 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str4, ei_iso8859_2},
1307 +#line 58 "lib/aliases.gperf"
1308 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str5, ei_iso8859_1},
1309 {-1}, {-1}, {-1}, {-1}, {-1},
1310 -#line 76 "lib/aliases.gperf"
1311 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str74, ei_iso8859_3},
1312 -#line 83 "lib/aliases.gperf"
1313 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str75, ei_iso8859_4},
1315 -#line 289 "lib/aliases.gperf"
1316 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str77, ei_isoir165},
1318 -#line 125 "lib/aliases.gperf"
1319 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str79, ei_iso8859_9},
1320 -#line 107 "lib/aliases.gperf"
1321 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str80, ei_iso8859_7},
1322 -#line 203 "lib/aliases.gperf"
1323 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str81, ei_cp862},
1324 -#line 90 "lib/aliases.gperf"
1325 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str82, ei_iso8859_5},
1326 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1327 -#line 150 "lib/aliases.gperf"
1328 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str89, ei_iso8859_14},
1330 -#line 286 "lib/aliases.gperf"
1331 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str91, ei_gb2312},
1332 - {-1}, {-1}, {-1}, {-1},
1333 -#line 124 "lib/aliases.gperf"
1334 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str96, ei_iso8859_9},
1335 -#line 144 "lib/aliases.gperf"
1336 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str97, ei_iso8859_13},
1337 -#line 158 "lib/aliases.gperf"
1338 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str98, ei_iso8859_15},
1340 -#line 294 "lib/aliases.gperf"
1341 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str100, ei_ksc5601},
1343 -#line 278 "lib/aliases.gperf"
1344 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str102, ei_jisx0212},
1345 -#line 163 "lib/aliases.gperf"
1346 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str103, ei_iso8859_16},
1348 -#line 67 "lib/aliases.gperf"
1349 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str107, ei_iso8859_2},
1350 -#line 102 "lib/aliases.gperf"
1351 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str108, ei_iso8859_6},
1352 -#line 149 "lib/aliases.gperf"
1353 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str109, ei_iso8859_14},
1354 +#line 79 "lib/aliases.gperf"
1355 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, ei_cp1250},
1356 +#line 55 "lib/aliases.gperf"
1357 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, ei_iso8859_1},
1359 -#line 62 "lib/aliases.gperf"
1360 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str112, ei_iso8859_1},
1361 -#line 94 "lib/aliases.gperf"
1362 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str113, ei_iso8859_6},
1363 -#line 95 "lib/aliases.gperf"
1364 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str114, ei_iso8859_6},
1365 -#line 166 "lib/aliases.gperf"
1366 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str115, ei_iso8859_16},
1367 -#line 233 "lib/aliases.gperf"
1368 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str116, ei_pt154},
1369 -#line 53 "lib/aliases.gperf"
1370 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str117, ei_iso8859_1},
1371 -#line 54 "lib/aliases.gperf"
1372 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str118, ei_iso8859_1},
1373 -#line 139 "lib/aliases.gperf"
1374 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str119, ei_iso8859_11},
1375 -#line 160 "lib/aliases.gperf"
1376 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str120, ei_iso8859_16},
1377 -#line 161 "lib/aliases.gperf"
1378 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str121, ei_iso8859_16},
1380 -#line 283 "lib/aliases.gperf"
1381 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str123, ei_iso646_cn},
1382 -#line 137 "lib/aliases.gperf"
1383 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str124, ei_iso8859_11},
1384 -#line 138 "lib/aliases.gperf"
1385 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str125, ei_iso8859_11},
1386 -#line 86 "lib/aliases.gperf"
1387 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str126, ei_iso8859_4},
1389 -#line 162 "lib/aliases.gperf"
1390 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str128, ei_iso8859_16},
1391 +#line 24 "lib/aliases.gperf"
1392 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_ucs2},
1393 +#line 56 "lib/aliases.gperf"
1394 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str16, ei_iso8859_1},
1395 +#line 23 "lib/aliases.gperf"
1396 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, ei_utf8},
1397 +#line 41 "lib/aliases.gperf"
1398 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, ei_utf32},
1399 +#line 38 "lib/aliases.gperf"
1400 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, ei_utf16},
1402 -#line 93 "lib/aliases.gperf"
1403 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str130, ei_iso8859_5},
1404 -#line 79 "lib/aliases.gperf"
1405 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str131, ei_iso8859_4},
1406 +#line 19 "lib/aliases.gperf"
1407 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, ei_ascii},
1408 +#line 68 "lib/aliases.gperf"
1409 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, ei_iso8859_2},
1410 +#line 60 "lib/aliases.gperf"
1411 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str23, ei_iso8859_1},
1412 +#line 20 "lib/aliases.gperf"
1413 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, ei_ascii},
1414 +#line 44 "lib/aliases.gperf"
1415 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, ei_utf7},
1416 #line 80 "lib/aliases.gperf"
1417 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str132, ei_iso8859_4},
1418 -#line 153 "lib/aliases.gperf"
1419 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str133, ei_iso8859_14},
1420 -#line 66 "lib/aliases.gperf"
1421 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str134, ei_iso8859_2},
1422 -#line 87 "lib/aliases.gperf"
1423 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str135, ei_iso8859_5},
1424 -#line 88 "lib/aliases.gperf"
1425 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str136, ei_iso8859_5},
1426 -#line 159 "lib/aliases.gperf"
1427 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str137, ei_iso8859_15},
1428 -#line 146 "lib/aliases.gperf"
1429 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str138, ei_iso8859_14},
1430 -#line 147 "lib/aliases.gperf"
1431 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str139, ei_iso8859_14},
1432 -#line 120 "lib/aliases.gperf"
1433 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str140, ei_iso8859_8},
1435 -#line 154 "lib/aliases.gperf"
1436 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str142, ei_iso8859_15},
1437 -#line 155 "lib/aliases.gperf"
1438 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str143, ei_iso8859_15},
1439 -#line 128 "lib/aliases.gperf"
1440 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str144, ei_iso8859_9},
1441 -#line 114 "lib/aliases.gperf"
1442 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str145, ei_iso8859_8},
1443 -#line 115 "lib/aliases.gperf"
1444 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str146, ei_iso8859_8},
1445 -#line 205 "lib/aliases.gperf"
1446 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str147, ei_cp866},
1447 -#line 117 "lib/aliases.gperf"
1448 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str148, ei_iso8859_8},
1449 -#line 121 "lib/aliases.gperf"
1450 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str149, ei_iso8859_9},
1451 -#line 122 "lib/aliases.gperf"
1452 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str150, ei_iso8859_9},
1453 -#line 148 "lib/aliases.gperf"
1454 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str151, ei_iso8859_14},
1456 -#line 156 "lib/aliases.gperf"
1457 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str153, ei_iso8859_15},
1459 -#line 109 "lib/aliases.gperf"
1460 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str155, ei_iso8859_7},
1461 -#line 253 "lib/aliases.gperf"
1462 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str156, ei_tcvn},
1463 -#line 51 "lib/aliases.gperf"
1464 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str157, ei_c99},
1465 -#line 70 "lib/aliases.gperf"
1466 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str158, ei_iso8859_2},
1468 -#line 235 "lib/aliases.gperf"
1469 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str162, ei_pt154},
1470 -#line 63 "lib/aliases.gperf"
1471 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str163, ei_iso8859_2},
1472 -#line 64 "lib/aliases.gperf"
1473 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str164, ei_iso8859_2},
1475 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, ei_local_char},
1476 #line 74 "lib/aliases.gperf"
1477 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str166, ei_iso8859_3},
1479 -#line 165 "lib/aliases.gperf"
1480 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str168, ei_iso8859_16},
1481 -#line 351 "lib/aliases.gperf"
1482 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str169, ei_local_char},
1483 - {-1}, {-1}, {-1}, {-1},
1484 -#line 189 "lib/aliases.gperf"
1485 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str174, ei_cp1256},
1486 -#line 142 "lib/aliases.gperf"
1487 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str175, ei_iso8859_13},
1488 -#line 281 "lib/aliases.gperf"
1489 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str176, ei_iso646_cn},
1490 -#line 13 "lib/aliases.gperf"
1491 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str177, ei_ascii},
1492 -#line 174 "lib/aliases.gperf"
1493 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str178, ei_cp1251},
1494 -#line 75 "lib/aliases.gperf"
1495 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str179, ei_iso8859_3},
1497 -#line 199 "lib/aliases.gperf"
1498 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str181, ei_cp850},
1500 -#line 314 "lib/aliases.gperf"
1501 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str183, ei_euc_cn},
1503 -#line 57 "lib/aliases.gperf"
1504 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str185, ei_iso8859_1},
1505 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1506 -#line 183 "lib/aliases.gperf"
1507 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str192, ei_cp1254},
1509 -#line 345 "lib/aliases.gperf"
1510 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str194, ei_cp949},
1512 -#line 186 "lib/aliases.gperf"
1513 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str196, ei_cp1255},
1514 -#line 201 "lib/aliases.gperf"
1515 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str197, ei_cp862},
1516 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, ei_iso8859_15},
1517 #line 21 "lib/aliases.gperf"
1518 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str198, ei_ascii},
1519 - {-1}, {-1}, {-1}, {-1},
1520 -#line 348 "lib/aliases.gperf"
1521 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str203, ei_johab},
1523 -#line 195 "lib/aliases.gperf"
1524 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str206, ei_cp1258},
1525 -#line 82 "lib/aliases.gperf"
1526 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str207, ei_iso8859_4},
1528 -#line 206 "lib/aliases.gperf"
1529 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str209, ei_cp866},
1530 -#line 318 "lib/aliases.gperf"
1531 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str210, ei_cp936},
1532 -#line 231 "lib/aliases.gperf"
1533 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str211, ei_georgian_ps},
1535 -#line 164 "lib/aliases.gperf"
1536 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str214, ei_iso8859_16},
1537 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1538 -#line 288 "lib/aliases.gperf"
1539 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str222, ei_gb2312},
1541 -#line 177 "lib/aliases.gperf"
1542 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str224, ei_cp1252},
1543 -#line 143 "lib/aliases.gperf"
1544 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str225, ei_iso8859_13},
1545 -#line 131 "lib/aliases.gperf"
1546 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str226, ei_iso8859_10},
1547 -#line 282 "lib/aliases.gperf"
1548 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str227, ei_iso646_cn},
1549 -#line 242 "lib/aliases.gperf"
1550 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str228, ei_tis620},
1552 -#line 78 "lib/aliases.gperf"
1553 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str230, ei_iso8859_3},
1554 -#line 33 "lib/aliases.gperf"
1555 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str231, ei_ucs4},
1556 -#line 271 "lib/aliases.gperf"
1557 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str232, ei_jisx0208},
1558 -#line 241 "lib/aliases.gperf"
1559 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str233, ei_tis620},
1560 -#line 132 "lib/aliases.gperf"
1561 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str234, ei_iso8859_10},
1562 -#line 71 "lib/aliases.gperf"
1563 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str235, ei_iso8859_3},
1564 -#line 72 "lib/aliases.gperf"
1565 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str236, ei_iso8859_3},
1566 -#line 145 "lib/aliases.gperf"
1567 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str237, ei_iso8859_13},
1569 -#line 135 "lib/aliases.gperf"
1570 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str240, ei_iso8859_10},
1571 -#line 330 "lib/aliases.gperf"
1572 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str241, ei_ces_big5},
1573 -#line 140 "lib/aliases.gperf"
1574 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str242, ei_iso8859_13},
1575 -#line 141 "lib/aliases.gperf"
1576 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str243, ei_iso8859_13},
1577 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, ei_ascii},
1578 #line 61 "lib/aliases.gperf"
1579 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str244, ei_iso8859_1},
1580 -#line 167 "lib/aliases.gperf"
1581 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str245, ei_koi8_r},
1582 -#line 331 "lib/aliases.gperf"
1583 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str246, ei_ces_big5},
1584 -#line 58 "lib/aliases.gperf"
1585 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str247, ei_iso8859_1},
1586 -#line 97 "lib/aliases.gperf"
1587 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str248, ei_iso8859_6},
1588 -#line 248 "lib/aliases.gperf"
1589 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str249, ei_cp874},
1591 -#line 14 "lib/aliases.gperf"
1592 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str251, ei_ascii},
1593 -#line 250 "lib/aliases.gperf"
1594 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str252, ei_viscii},
1595 -#line 173 "lib/aliases.gperf"
1596 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str253, ei_cp1250},
1598 -#line 179 "lib/aliases.gperf"
1599 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str256, ei_cp1252},
1601 -#line 85 "lib/aliases.gperf"
1602 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str258, ei_iso8859_4},
1603 -#line 202 "lib/aliases.gperf"
1604 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str259, ei_cp862},
1605 -#line 306 "lib/aliases.gperf"
1606 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str260, ei_cp932},
1607 -#line 277 "lib/aliases.gperf"
1608 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str261, ei_jisx0212},
1609 -#line 127 "lib/aliases.gperf"
1610 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str262, ei_iso8859_9},
1611 -#line 24 "lib/aliases.gperf"
1612 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str263, ei_ucs2},
1613 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str29, ei_iso8859_2},
1615 -#line 136 "lib/aliases.gperf"
1616 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str265, ei_iso8859_10},
1617 -#line 319 "lib/aliases.gperf"
1618 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str266, ei_cp936},
1619 -#line 352 "lib/aliases.gperf"
1620 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str267, ei_local_wchar_t},
1622 -#line 129 "lib/aliases.gperf"
1623 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str270, ei_iso8859_10},
1624 -#line 130 "lib/aliases.gperf"
1625 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str271, ei_iso8859_10},
1626 -#line 38 "lib/aliases.gperf"
1627 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str272, ei_utf16},
1628 -#line 313 "lib/aliases.gperf"
1629 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str273, ei_euc_cn},
1630 -#line 225 "lib/aliases.gperf"
1631 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str274, ei_hp_roman8},
1632 -#line 157 "lib/aliases.gperf"
1633 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str275, ei_iso8859_15},
1634 -#line 113 "lib/aliases.gperf"
1635 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str276, ei_iso8859_7},
1636 -#line 232 "lib/aliases.gperf"
1637 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str277, ei_koi8_t},
1638 -#line 312 "lib/aliases.gperf"
1639 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str278, ei_euc_cn},
1640 -#line 37 "lib/aliases.gperf"
1641 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str279, ei_ucs4le},
1642 -#line 56 "lib/aliases.gperf"
1643 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str280, ei_iso8859_1},
1644 -#line 103 "lib/aliases.gperf"
1645 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str281, ei_iso8859_7},
1646 -#line 104 "lib/aliases.gperf"
1647 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str282, ei_iso8859_7},
1648 -#line 238 "lib/aliases.gperf"
1649 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str283, ei_mulelao},
1650 -#line 280 "lib/aliases.gperf"
1651 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str284, ei_iso646_cn},
1653 -#line 264 "lib/aliases.gperf"
1654 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str288, ei_jisx0201},
1655 -#line 98 "lib/aliases.gperf"
1656 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str289, ei_iso8859_6},
1657 +#line 51 "lib/aliases.gperf"
1658 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str31, ei_iso8859_1},
1659 #line 69 "lib/aliases.gperf"
1660 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str290, ei_iso8859_2},
1661 -#line 230 "lib/aliases.gperf"
1662 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str291, ei_georgian_academy},
1663 -#line 234 "lib/aliases.gperf"
1664 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str292, ei_pt154},
1666 -#line 31 "lib/aliases.gperf"
1667 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str295, ei_ucs2le},
1668 -#line 180 "lib/aliases.gperf"
1669 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str296, ei_cp1253},
1670 -#line 23 "lib/aliases.gperf"
1671 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str297, ei_utf8},
1672 -#line 224 "lib/aliases.gperf"
1673 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str298, ei_hp_roman8},
1675 -#line 22 "lib/aliases.gperf"
1676 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str300, ei_ascii},
1678 -#line 108 "lib/aliases.gperf"
1679 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str303, ei_iso8859_7},
1680 -#line 49 "lib/aliases.gperf"
1681 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str304, ei_ucs4internal},
1682 -#line 255 "lib/aliases.gperf"
1683 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str305, ei_tcvn},
1685 -#line 296 "lib/aliases.gperf"
1686 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str307, ei_ksc5601},
1687 -#line 197 "lib/aliases.gperf"
1688 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str308, ei_cp850},
1689 -#line 176 "lib/aliases.gperf"
1690 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str309, ei_cp1251},
1691 -#line 336 "lib/aliases.gperf"
1692 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str310, ei_cp950},
1694 -#line 243 "lib/aliases.gperf"
1695 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str313, ei_tis620},
1697 -#line 270 "lib/aliases.gperf"
1698 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str316, ei_jisx0208},
1700 -#line 110 "lib/aliases.gperf"
1701 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str319, ei_iso8859_7},
1702 -#line 47 "lib/aliases.gperf"
1703 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str320, ei_ucs2internal},
1704 -#line 254 "lib/aliases.gperf"
1705 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str321, ei_tcvn},
1707 -#line 239 "lib/aliases.gperf"
1708 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str323, ei_cp1133},
1709 -#line 171 "lib/aliases.gperf"
1710 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str324, ei_cp1250},
1712 -#line 322 "lib/aliases.gperf"
1713 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str327, ei_iso2022_cn},
1714 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, ei_iso8859_15},
1715 +#line 62 "lib/aliases.gperf"
1716 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, ei_iso8859_2},
1718 +#line 52 "lib/aliases.gperf"
1719 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str35, ei_iso8859_1},
1720 +#line 70 "lib/aliases.gperf"
1721 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, ei_iso8859_15},
1722 +#line 75 "lib/aliases.gperf"
1723 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str37, ei_koi8_r},
1724 +#line 31 "lib/aliases.gperf"
1725 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str38, ei_ucs2le},
1726 +#line 43 "lib/aliases.gperf"
1727 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str39, ei_utf32le},
1728 #line 40 "lib/aliases.gperf"
1729 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str329, ei_utf16le},
1730 - {-1}, {-1}, {-1}, {-1}, {-1},
1731 -#line 236 "lib/aliases.gperf"
1732 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str335, ei_pt154},
1734 -#line 34 "lib/aliases.gperf"
1735 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str337, ei_ucs4},
1737 -#line 324 "lib/aliases.gperf"
1738 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str340, ei_iso2022_cn_ext},
1740 -#line 192 "lib/aliases.gperf"
1741 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str342, ei_cp1257},
1743 -#line 285 "lib/aliases.gperf"
1744 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str345, ei_gb2312},
1746 -#line 260 "lib/aliases.gperf"
1747 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str347, ei_iso646_jp},
1749 -#line 343 "lib/aliases.gperf"
1750 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str351, ei_euc_kr},
1752 -#line 25 "lib/aliases.gperf"
1753 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str353, ei_ucs2},
1754 -#line 321 "lib/aliases.gperf"
1755 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str354, ei_gb18030},
1757 -#line 342 "lib/aliases.gperf"
1758 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str356, ei_euc_kr},
1759 -#line 168 "lib/aliases.gperf"
1760 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str357, ei_koi8_r},
1761 -#line 335 "lib/aliases.gperf"
1762 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str358, ei_ces_big5},
1764 -#line 19 "lib/aliases.gperf"
1765 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str360, ei_ascii},
1766 -#line 210 "lib/aliases.gperf"
1767 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str361, ei_mac_roman},
1768 -#line 77 "lib/aliases.gperf"
1769 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str362, ei_iso8859_3},
1770 -#line 334 "lib/aliases.gperf"
1771 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str363, ei_ces_big5},
1773 -#line 91 "lib/aliases.gperf"
1774 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str366, ei_iso8859_5},
1776 -#line 252 "lib/aliases.gperf"
1777 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str369, ei_viscii},
1778 -#line 198 "lib/aliases.gperf"
1779 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str370, ei_cp850},
1780 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, ei_utf16le},
1781 +#line 71 "lib/aliases.gperf"
1782 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, ei_iso8859_15},
1784 -#line 223 "lib/aliases.gperf"
1785 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str372, ei_mac_thai},
1786 +#line 63 "lib/aliases.gperf"
1787 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_iso8859_2},
1788 +#line 53 "lib/aliases.gperf"
1789 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str44, ei_iso8859_1},
1790 +#line 33 "lib/aliases.gperf"
1791 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str45, ei_ucs4},
1793 #line 29 "lib/aliases.gperf"
1794 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str374, ei_ucs2be},
1796 -#line 15 "lib/aliases.gperf"
1797 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str376, ei_ascii},
1799 -#line 12 "lib/aliases.gperf"
1800 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str380, ei_ascii},
1801 -#line 41 "lib/aliases.gperf"
1802 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str381, ei_utf32},
1804 -#line 290 "lib/aliases.gperf"
1805 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str384, ei_isoir165},
1807 -#line 228 "lib/aliases.gperf"
1808 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str387, ei_nextstep},
1810 -#line 211 "lib/aliases.gperf"
1811 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str389, ei_mac_roman},
1813 -#line 299 "lib/aliases.gperf"
1814 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str393, ei_euc_jp},
1815 -#line 101 "lib/aliases.gperf"
1816 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str394, ei_iso8859_6},
1817 -#line 326 "lib/aliases.gperf"
1818 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str395, ei_hz},
1820 -#line 229 "lib/aliases.gperf"
1821 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str397, ei_armscii_8},
1823 -#line 119 "lib/aliases.gperf"
1824 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str401, ei_iso8859_8},
1826 -#line 349 "lib/aliases.gperf"
1827 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str405, ei_iso2022_kr},
1829 -#line 190 "lib/aliases.gperf"
1830 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str407, ei_cp1256},
1831 -#line 346 "lib/aliases.gperf"
1832 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str408, ei_cp949},
1833 -#line 175 "lib/aliases.gperf"
1834 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str409, ei_cp1251},
1836 -#line 188 "lib/aliases.gperf"
1837 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str411, ei_cp1255},
1838 -#line 152 "lib/aliases.gperf"
1839 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str412, ei_iso8859_14},
1840 -#line 43 "lib/aliases.gperf"
1841 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str413, ei_utf32le},
1843 -#line 184 "lib/aliases.gperf"
1844 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str416, ei_cp1254},
1846 -#line 187 "lib/aliases.gperf"
1847 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str418, ei_cp1255},
1849 -#line 302 "lib/aliases.gperf"
1850 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str420, ei_sjis},
1851 -#line 301 "lib/aliases.gperf"
1852 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str421, ei_sjis},
1853 -#line 20 "lib/aliases.gperf"
1854 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str422, ei_ascii},
1855 -#line 196 "lib/aliases.gperf"
1856 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str423, ei_cp1258},
1857 -#line 237 "lib/aliases.gperf"
1858 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str424, ei_pt154},
1860 -#line 317 "lib/aliases.gperf"
1861 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str426, ei_ces_gbk},
1863 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str47, ei_ucs2be},
1864 +#line 16 "lib/aliases.gperf"
1865 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str48, ei_ascii},
1866 +#line 76 "lib/aliases.gperf"
1867 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str49, ei_koi8_r},
1868 +#line 13 "lib/aliases.gperf"
1869 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str50, ei_ascii},
1870 +#line 28 "lib/aliases.gperf"
1871 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str51, ei_ucs2be},
1872 +#line 72 "lib/aliases.gperf"
1873 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str52, ei_iso8859_15},
1874 +#line 37 "lib/aliases.gperf"
1875 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str53, ei_ucs4le},
1876 +#line 64 "lib/aliases.gperf"
1877 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str54, ei_iso8859_2},
1878 +#line 77 "lib/aliases.gperf"
1879 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str55, ei_cp1250},
1880 +#line 25 "lib/aliases.gperf"
1881 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str56, ei_ucs2},
1882 +#line 45 "lib/aliases.gperf"
1883 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str57, ei_utf7},
1884 +#line 65 "lib/aliases.gperf"
1885 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str58, ei_iso8859_2},
1886 #line 32 "lib/aliases.gperf"
1887 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str428, ei_ucs2le},
1889 -#line 178 "lib/aliases.gperf"
1890 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str432, ei_cp1252},
1891 -#line 44 "lib/aliases.gperf"
1892 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str433, ei_utf7},
1894 -#line 291 "lib/aliases.gperf"
1895 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str435, ei_ksc5601},
1896 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str59, ei_ucs2le},
1897 +#line 57 "lib/aliases.gperf"
1898 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str60, ei_iso8859_1},
1899 +#line 15 "lib/aliases.gperf"
1900 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str61, ei_ascii},
1901 +#line 14 "lib/aliases.gperf"
1902 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str62, ei_ascii},
1903 +#line 26 "lib/aliases.gperf"
1904 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str63, ei_ucs2},
1905 +#line 47 "lib/aliases.gperf"
1906 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str64, ei_ucs2internal},
1907 +#line 73 "lib/aliases.gperf"
1908 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str65, ei_iso8859_15},
1909 +#line 81 "lib/aliases.gperf"
1910 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str66, ei_local_wchar_t},
1912 -#line 99 "lib/aliases.gperf"
1913 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str437, ei_iso8859_6},
1915 -#line 323 "lib/aliases.gperf"
1916 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str440, ei_iso2022_cn},
1918 -#line 333 "lib/aliases.gperf"
1919 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str444, ei_ces_big5},
1921 -#line 320 "lib/aliases.gperf"
1922 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str447, ei_cp936},
1923 #line 35 "lib/aliases.gperf"
1924 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str448, ei_ucs4},
1925 -#line 332 "lib/aliases.gperf"
1926 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str449, ei_ces_big5},
1928 -#line 258 "lib/aliases.gperf"
1929 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str453, ei_iso646_jp},
1931 -#line 244 "lib/aliases.gperf"
1932 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str456, ei_tis620},
1933 -#line 112 "lib/aliases.gperf"
1934 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str457, ei_iso8859_7},
1936 -#line 92 "lib/aliases.gperf"
1937 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str459, ei_iso8859_5},
1938 -#line 36 "lib/aliases.gperf"
1939 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str460, ei_ucs4be},
1941 -#line 45 "lib/aliases.gperf"
1942 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str462, ei_utf7},
1944 -#line 328 "lib/aliases.gperf"
1945 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str465, ei_euc_tw},
1947 -#line 181 "lib/aliases.gperf"
1948 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str468, ei_cp1253},
1949 -#line 227 "lib/aliases.gperf"
1950 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str469, ei_hp_roman8},
1951 -#line 327 "lib/aliases.gperf"
1952 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str470, ei_euc_tw},
1954 -#line 293 "lib/aliases.gperf"
1955 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str472, ei_ksc5601},
1957 -#line 27 "lib/aliases.gperf"
1958 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str476, ei_ucs2be},
1960 -#line 251 "lib/aliases.gperf"
1961 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str479, ei_viscii},
1962 -#line 111 "lib/aliases.gperf"
1963 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str480, ei_iso8859_7},
1965 -#line 172 "lib/aliases.gperf"
1966 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str482, ei_cp1250},
1967 -#line 316 "lib/aliases.gperf"
1968 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str483, ei_euc_cn},
1970 -#line 249 "lib/aliases.gperf"
1971 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str486, ei_cp874},
1972 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str68, ei_ucs4},
1973 #line 30 "lib/aliases.gperf"
1974 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str487, ei_ucs2be},
1976 -#line 52 "lib/aliases.gperf"
1977 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str489, ei_java},
1979 -#line 193 "lib/aliases.gperf"
1980 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str491, ei_cp1257},
1982 -#line 26 "lib/aliases.gperf"
1983 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str493, ei_ucs2},
1984 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1985 -#line 265 "lib/aliases.gperf"
1986 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str500, ei_jisx0201},
1988 -#line 284 "lib/aliases.gperf"
1989 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str502, ei_iso646_cn},
1991 -#line 214 "lib/aliases.gperf"
1992 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str504, ei_mac_iceland},
1993 - {-1}, {-1}, {-1}, {-1},
1994 -#line 208 "lib/aliases.gperf"
1995 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str509, ei_cp866},
1996 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str69, ei_ucs2be},
1997 +#line 12 "lib/aliases.gperf"
1998 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str70, ei_ascii},
1999 +#line 34 "lib/aliases.gperf"
2000 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str71, ei_ucs4},
2001 +#line 27 "lib/aliases.gperf"
2002 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str72, ei_ucs2be},
2003 +#line 42 "lib/aliases.gperf"
2004 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str73, ei_utf32be},
2005 #line 39 "lib/aliases.gperf"
2006 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str510, ei_utf16be},
2008 -#line 100 "lib/aliases.gperf"
2009 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str513, ei_iso8859_6},
2010 -#line 315 "lib/aliases.gperf"
2011 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str514, ei_euc_cn},
2013 -#line 350 "lib/aliases.gperf"
2014 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str518, ei_iso2022_kr},
2016 -#line 212 "lib/aliases.gperf"
2017 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str520, ei_mac_roman},
2018 - {-1}, {-1}, {-1}, {-1}, {-1},
2019 -#line 269 "lib/aliases.gperf"
2020 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str526, ei_jisx0208},
2022 -#line 209 "lib/aliases.gperf"
2023 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str528, ei_mac_roman},
2025 -#line 81 "lib/aliases.gperf"
2026 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str530, ei_iso8859_4},
2028 -#line 89 "lib/aliases.gperf"
2029 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str532, ei_iso8859_5},
2031 -#line 246 "lib/aliases.gperf"
2032 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str535, ei_tis620},
2033 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str74, ei_utf16be},
2034 #line 18 "lib/aliases.gperf"
2035 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str536, ei_ascii},
2036 -#line 116 "lib/aliases.gperf"
2037 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str537, ei_iso8859_8},
2038 -#line 292 "lib/aliases.gperf"
2039 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str538, ei_ksc5601},
2040 -#line 305 "lib/aliases.gperf"
2041 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str539, ei_sjis},
2042 -#line 118 "lib/aliases.gperf"
2043 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str540, ei_iso8859_8},
2044 -#line 123 "lib/aliases.gperf"
2045 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str541, ei_iso8859_9},
2046 - {-1}, {-1}, {-1}, {-1}, {-1},
2047 -#line 215 "lib/aliases.gperf"
2048 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str547, ei_mac_croatian},
2049 -#line 309 "lib/aliases.gperf"
2050 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str548, ei_iso2022_jp1},
2052 -#line 298 "lib/aliases.gperf"
2053 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str550, ei_euc_jp},
2055 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str75, ei_ascii},
2056 #line 17 "lib/aliases.gperf"
2057 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str552, ei_ascii},
2059 -#line 297 "lib/aliases.gperf"
2060 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str555, ei_euc_jp},
2061 - {-1}, {-1}, {-1}, {-1}, {-1},
2062 -#line 287 "lib/aliases.gperf"
2063 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str561, ei_gb2312},
2064 -#line 272 "lib/aliases.gperf"
2065 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str562, ei_jisx0208},
2067 -#line 240 "lib/aliases.gperf"
2068 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str566, ei_cp1133},
2070 -#line 213 "lib/aliases.gperf"
2071 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str569, ei_mac_centraleurope},
2072 -#line 279 "lib/aliases.gperf"
2073 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str570, ei_jisx0212},
2074 -#line 310 "lib/aliases.gperf"
2075 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str571, ei_iso2022_jp2},
2077 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str76, ei_ascii},
2078 #line 46 "lib/aliases.gperf"
2079 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str573, ei_utf7},
2080 -#line 50 "lib/aliases.gperf"
2081 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str574, ei_ucs4swapped},
2083 -#line 28 "lib/aliases.gperf"
2084 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str578, ei_ucs2be},
2085 -#line 261 "lib/aliases.gperf"
2086 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str579, ei_iso646_jp},
2087 -#line 257 "lib/aliases.gperf"
2088 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str580, ei_iso646_jp},
2090 -#line 73 "lib/aliases.gperf"
2091 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str582, ei_iso8859_3},
2093 -#line 204 "lib/aliases.gperf"
2094 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str586, ei_cp862},
2096 -#line 340 "lib/aliases.gperf"
2097 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str588, ei_big5hkscs2004},
2098 -#line 96 "lib/aliases.gperf"
2099 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str589, ei_iso8859_6},
2100 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str77, ei_utf7},
2101 #line 48 "lib/aliases.gperf"
2102 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str590, ei_ucs2swapped},
2103 -#line 55 "lib/aliases.gperf"
2104 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str591, ei_iso8859_1},
2106 -#line 339 "lib/aliases.gperf"
2107 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str593, ei_big5hkscs2004},
2108 -#line 42 "lib/aliases.gperf"
2109 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str594, ei_utf32be},
2110 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2111 -#line 307 "lib/aliases.gperf"
2112 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str604, ei_iso2022_jp},
2114 -#line 169 "lib/aliases.gperf"
2115 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str607, ei_koi8_u},
2116 -#line 245 "lib/aliases.gperf"
2117 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str608, ei_tis620},
2119 -#line 170 "lib/aliases.gperf"
2120 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str612, ei_koi8_ru},
2122 -#line 65 "lib/aliases.gperf"
2123 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str614, ei_iso8859_2},
2125 -#line 216 "lib/aliases.gperf"
2126 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str618, ei_mac_romania},
2127 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2128 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2129 - {-1}, {-1}, {-1}, {-1},
2130 -#line 274 "lib/aliases.gperf"
2131 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str641, ei_jisx0212},
2132 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2133 -#line 344 "lib/aliases.gperf"
2134 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str648, ei_euc_kr},
2135 -#line 217 "lib/aliases.gperf"
2136 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str649, ei_mac_cyrillic},
2137 -#line 106 "lib/aliases.gperf"
2138 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str650, ei_iso8859_7},
2139 -#line 191 "lib/aliases.gperf"
2140 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str651, ei_cp1256},
2141 - {-1}, {-1}, {-1}, {-1}, {-1},
2142 -#line 182 "lib/aliases.gperf"
2143 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str657, ei_cp1253},
2144 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2145 -#line 295 "lib/aliases.gperf"
2146 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str666, ei_ksc5601},
2148 -#line 262 "lib/aliases.gperf"
2149 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str668, ei_jisx0201},
2150 - {-1}, {-1}, {-1}, {-1},
2151 -#line 105 "lib/aliases.gperf"
2152 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str673, ei_iso8859_7},
2153 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2154 -#line 311 "lib/aliases.gperf"
2155 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str683, ei_iso2022_jp2},
2156 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2158 -#line 266 "lib/aliases.gperf"
2159 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str696, ei_jisx0208},
2160 -#line 263 "lib/aliases.gperf"
2161 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str697, ei_jisx0201},
2162 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2163 -#line 276 "lib/aliases.gperf"
2164 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str706, ei_jisx0212},
2165 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2167 -#line 308 "lib/aliases.gperf"
2168 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str717, ei_iso2022_jp},
2170 -#line 347 "lib/aliases.gperf"
2171 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str721, ei_johab},
2172 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2173 -#line 304 "lib/aliases.gperf"
2174 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str730, ei_sjis},
2176 -#line 273 "lib/aliases.gperf"
2177 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str734, ei_jisx0208},
2179 -#line 220 "lib/aliases.gperf"
2180 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str737, ei_mac_turkish},
2181 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2182 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2183 -#line 256 "lib/aliases.gperf"
2184 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str755, ei_tcvn},
2185 -#line 267 "lib/aliases.gperf"
2186 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str756, ei_jisx0208},
2187 - {-1}, {-1}, {-1}, {-1}, {-1},
2188 -#line 329 "lib/aliases.gperf"
2189 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str762, ei_euc_tw},
2190 -#line 219 "lib/aliases.gperf"
2191 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str763, ei_mac_greek},
2192 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2193 -#line 268 "lib/aliases.gperf"
2194 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str770, ei_jisx0208},
2195 - {-1}, {-1}, {-1}, {-1}, {-1},
2196 -#line 194 "lib/aliases.gperf"
2197 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str776, ei_cp1257},
2198 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2199 - {-1}, {-1}, {-1}, {-1},
2200 -#line 185 "lib/aliases.gperf"
2201 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str790, ei_cp1254},
2203 -#line 218 "lib/aliases.gperf"
2204 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str792, ei_mac_ukraine},
2206 -#line 222 "lib/aliases.gperf"
2207 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str796, ei_mac_arabic},
2208 - {-1}, {-1}, {-1}, {-1}, {-1},
2209 -#line 200 "lib/aliases.gperf"
2210 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str802, ei_cp850},
2211 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2212 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2213 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2214 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2215 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str78, ei_ucs2swapped},
2216 +#line 49 "lib/aliases.gperf"
2217 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str79, ei_ucs4internal},
2218 +#line 22 "lib/aliases.gperf"
2219 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str80, ei_ascii},
2220 {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2221 -#line 221 "lib/aliases.gperf"
2222 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str845, ei_mac_hebrew},
2223 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2224 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2225 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2226 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2227 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2228 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2229 +#line 36 "lib/aliases.gperf"
2230 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str87, ei_ucs4be},
2231 +#line 78 "lib/aliases.gperf"
2232 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str88, ei_cp1250},
2234 -#line 275 "lib/aliases.gperf"
2235 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str903, ei_jisx0212},
2236 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2237 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2238 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2239 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2240 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2241 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2242 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2243 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2244 +#line 54 "lib/aliases.gperf"
2245 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str92, ei_iso8859_1},
2246 +#line 50 "lib/aliases.gperf"
2247 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str93, ei_ucs4swapped},
2249 -#line 338 "lib/aliases.gperf"
2250 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str979, ei_big5hkscs2001},
2251 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2252 -#line 341 "lib/aliases.gperf"
2253 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str986, ei_big5hkscs2004},
2254 - {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
2255 -#line 337 "lib/aliases.gperf"
2256 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str995, ei_big5hkscs1999},
2258 -#line 300 "lib/aliases.gperf"
2259 - {(int)(long)&((struct stringpool_t *)0)->stringpool_str997, ei_euc_jp}
2260 +#line 67 "lib/aliases.gperf"
2261 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str97, ei_iso8859_2},
2262 +#line 59 "lib/aliases.gperf"
2263 + {(int)(long)&((struct stringpool_t *)0)->stringpool_str98, ei_iso8859_1}
2267 diff -urN libiconv-1.11.old/lib/canonical_dos.h libiconv-1.11.new/lib/canonical_dos.h
2268 --- libiconv-1.11.old/lib/canonical_dos.h 2005-05-19 19:08:39.000000000 +0200
2269 +++ libiconv-1.11.new/lib/canonical_dos.h 2007-11-11 14:41:34.000000000 +0100
2271 (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_0,
2272 - (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_4,
2273 - (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_5,
2274 - (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_8,
2275 - (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_12,
2276 - (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_13,
2277 - (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_17,
2278 - (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_21,
2279 - (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_22,
2280 - (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_26,
2281 - (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_31,
2282 - (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_35,
2283 - (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_38,
2284 - (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_42,
2285 - (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_47,
2286 diff -urN libiconv-1.11.old/lib/canonical.h libiconv-1.11.new/lib/canonical.h
2287 --- libiconv-1.11.old/lib/canonical.h 2006-05-18 14:45:20.000000000 +0200
2288 +++ libiconv-1.11.new/lib/canonical.h 2007-11-11 15:05:29.000000000 +0100
2290 - (int)(long)&((struct stringpool_t *)0)->stringpool_str380,
2291 - (int)(long)&((struct stringpool_t *)0)->stringpool_str297,
2292 - (int)(long)&((struct stringpool_t *)0)->stringpool_str263,
2293 - (int)(long)&((struct stringpool_t *)0)->stringpool_str476,
2294 - (int)(long)&((struct stringpool_t *)0)->stringpool_str295,
2295 - (int)(long)&((struct stringpool_t *)0)->stringpool_str231,
2296 - (int)(long)&((struct stringpool_t *)0)->stringpool_str460,
2297 - (int)(long)&((struct stringpool_t *)0)->stringpool_str279,
2298 - (int)(long)&((struct stringpool_t *)0)->stringpool_str272,
2299 - (int)(long)&((struct stringpool_t *)0)->stringpool_str510,
2300 - (int)(long)&((struct stringpool_t *)0)->stringpool_str329,
2301 - (int)(long)&((struct stringpool_t *)0)->stringpool_str381,
2302 - (int)(long)&((struct stringpool_t *)0)->stringpool_str594,
2303 - (int)(long)&((struct stringpool_t *)0)->stringpool_str413,
2304 - (int)(long)&((struct stringpool_t *)0)->stringpool_str433,
2305 - (int)(long)&((struct stringpool_t *)0)->stringpool_str320,
2306 - (int)(long)&((struct stringpool_t *)0)->stringpool_str590,
2307 - (int)(long)&((struct stringpool_t *)0)->stringpool_str304,
2308 - (int)(long)&((struct stringpool_t *)0)->stringpool_str574,
2309 - (int)(long)&((struct stringpool_t *)0)->stringpool_str157,
2310 - (int)(long)&((struct stringpool_t *)0)->stringpool_str489,
2311 - (int)(long)&((struct stringpool_t *)0)->stringpool_str117,
2312 - (int)(long)&((struct stringpool_t *)0)->stringpool_str163,
2313 - (int)(long)&((struct stringpool_t *)0)->stringpool_str235,
2314 - (int)(long)&((struct stringpool_t *)0)->stringpool_str131,
2315 - (int)(long)&((struct stringpool_t *)0)->stringpool_str135,
2316 - (int)(long)&((struct stringpool_t *)0)->stringpool_str113,
2317 - (int)(long)&((struct stringpool_t *)0)->stringpool_str281,
2318 - (int)(long)&((struct stringpool_t *)0)->stringpool_str145,
2319 - (int)(long)&((struct stringpool_t *)0)->stringpool_str149,
2320 - (int)(long)&((struct stringpool_t *)0)->stringpool_str270,
2321 - (int)(long)&((struct stringpool_t *)0)->stringpool_str124,
2322 - (int)(long)&((struct stringpool_t *)0)->stringpool_str242,
2323 - (int)(long)&((struct stringpool_t *)0)->stringpool_str138,
2324 - (int)(long)&((struct stringpool_t *)0)->stringpool_str142,
2325 - (int)(long)&((struct stringpool_t *)0)->stringpool_str120,
2326 - (int)(long)&((struct stringpool_t *)0)->stringpool_str245,
2327 - (int)(long)&((struct stringpool_t *)0)->stringpool_str607,
2328 - (int)(long)&((struct stringpool_t *)0)->stringpool_str612,
2329 - (int)(long)&((struct stringpool_t *)0)->stringpool_str324,
2330 - (int)(long)&((struct stringpool_t *)0)->stringpool_str178,
2331 - (int)(long)&((struct stringpool_t *)0)->stringpool_str224,
2332 - (int)(long)&((struct stringpool_t *)0)->stringpool_str296,
2333 - (int)(long)&((struct stringpool_t *)0)->stringpool_str192,
2334 - (int)(long)&((struct stringpool_t *)0)->stringpool_str196,
2335 - (int)(long)&((struct stringpool_t *)0)->stringpool_str174,
2336 - (int)(long)&((struct stringpool_t *)0)->stringpool_str342,
2337 - (int)(long)&((struct stringpool_t *)0)->stringpool_str206,
2338 - (int)(long)&((struct stringpool_t *)0)->stringpool_str308,
2339 - (int)(long)&((struct stringpool_t *)0)->stringpool_str197,
2340 - (int)(long)&((struct stringpool_t *)0)->stringpool_str147,
2341 - (int)(long)&((struct stringpool_t *)0)->stringpool_str528,
2342 - (int)(long)&((struct stringpool_t *)0)->stringpool_str569,
2343 - (int)(long)&((struct stringpool_t *)0)->stringpool_str504,
2344 - (int)(long)&((struct stringpool_t *)0)->stringpool_str547,
2345 - (int)(long)&((struct stringpool_t *)0)->stringpool_str618,
2346 - (int)(long)&((struct stringpool_t *)0)->stringpool_str649,
2347 - (int)(long)&((struct stringpool_t *)0)->stringpool_str792,
2348 - (int)(long)&((struct stringpool_t *)0)->stringpool_str763,
2349 - (int)(long)&((struct stringpool_t *)0)->stringpool_str737,
2350 - (int)(long)&((struct stringpool_t *)0)->stringpool_str845,
2351 - (int)(long)&((struct stringpool_t *)0)->stringpool_str796,
2352 - (int)(long)&((struct stringpool_t *)0)->stringpool_str372,
2353 - (int)(long)&((struct stringpool_t *)0)->stringpool_str298,
2354 - (int)(long)&((struct stringpool_t *)0)->stringpool_str387,
2355 - (int)(long)&((struct stringpool_t *)0)->stringpool_str397,
2356 - (int)(long)&((struct stringpool_t *)0)->stringpool_str291,
2357 - (int)(long)&((struct stringpool_t *)0)->stringpool_str211,
2358 - (int)(long)&((struct stringpool_t *)0)->stringpool_str277,
2359 - (int)(long)&((struct stringpool_t *)0)->stringpool_str116,
2360 - (int)(long)&((struct stringpool_t *)0)->stringpool_str283,
2361 - (int)(long)&((struct stringpool_t *)0)->stringpool_str323,
2362 - (int)(long)&((struct stringpool_t *)0)->stringpool_str233,
2363 - (int)(long)&((struct stringpool_t *)0)->stringpool_str249,
2364 - (int)(long)&((struct stringpool_t *)0)->stringpool_str252,
2365 - (int)(long)&((struct stringpool_t *)0)->stringpool_str156,
2366 - (int)(long)&((struct stringpool_t *)0)->stringpool_str580,
2367 - (int)(long)&((struct stringpool_t *)0)->stringpool_str668,
2368 - (int)(long)&((struct stringpool_t *)0)->stringpool_str696,
2369 - (int)(long)&((struct stringpool_t *)0)->stringpool_str641,
2370 - (int)(long)&((struct stringpool_t *)0)->stringpool_str284,
2371 - (int)(long)&((struct stringpool_t *)0)->stringpool_str345,
2372 (int)(long)&((struct stringpool_t *)0)->stringpool_str77,
2373 - (int)(long)&((struct stringpool_t *)0)->stringpool_str435,
2374 - (int)(long)&((struct stringpool_t *)0)->stringpool_str555,
2375 - (int)(long)&((struct stringpool_t *)0)->stringpool_str421,
2376 - (int)(long)&((struct stringpool_t *)0)->stringpool_str260,
2377 - (int)(long)&((struct stringpool_t *)0)->stringpool_str604,
2378 - (int)(long)&((struct stringpool_t *)0)->stringpool_str548,
2379 - (int)(long)&((struct stringpool_t *)0)->stringpool_str571,
2380 - (int)(long)&((struct stringpool_t *)0)->stringpool_str278,
2381 - (int)(long)&((struct stringpool_t *)0)->stringpool_str426,
2382 - (int)(long)&((struct stringpool_t *)0)->stringpool_str210,
2383 - (int)(long)&((struct stringpool_t *)0)->stringpool_str354,
2384 - (int)(long)&((struct stringpool_t *)0)->stringpool_str327,
2385 - (int)(long)&((struct stringpool_t *)0)->stringpool_str340,
2386 - (int)(long)&((struct stringpool_t *)0)->stringpool_str18,
2387 - (int)(long)&((struct stringpool_t *)0)->stringpool_str470,
2388 - (int)(long)&((struct stringpool_t *)0)->stringpool_str241,
2389 - (int)(long)&((struct stringpool_t *)0)->stringpool_str310,
2390 - (int)(long)&((struct stringpool_t *)0)->stringpool_str995,
2391 - (int)(long)&((struct stringpool_t *)0)->stringpool_str979,
2392 - (int)(long)&((struct stringpool_t *)0)->stringpool_str593,
2393 - (int)(long)&((struct stringpool_t *)0)->stringpool_str356,
2394 - (int)(long)&((struct stringpool_t *)0)->stringpool_str194,
2395 - (int)(long)&((struct stringpool_t *)0)->stringpool_str721,
2396 - (int)(long)&((struct stringpool_t *)0)->stringpool_str405,
2397 diff -urN libiconv-1.11.old/lib/canonical_local.h libiconv-1.11.new/lib/canonical_local.h
2398 --- libiconv-1.11.old/lib/canonical_local.h 2006-05-18 14:45:20.000000000 +0200
2399 +++ libiconv-1.11.new/lib/canonical_local.h 2007-11-11 15:20:08.000000000 +0100
2401 - (int)(long)&((struct stringpool_t *)0)->stringpool_str169,
2402 - (int)(long)&((struct stringpool_t *)0)->stringpool_str267,
2404 diff -urN libiconv-1.11.old/lib/converters.h libiconv-1.11.new/lib/converters.h
2405 --- libiconv-1.11.old/lib/converters.h 2006-05-18 14:43:55.000000000 +0200
2406 +++ libiconv-1.11.new/lib/converters.h 2007-11-11 14:44:59.000000000 +0100
2407 @@ -129,161 +129,15 @@
2408 #include "ucs2swapped.h"
2409 #include "ucs4internal.h"
2410 #include "ucs4swapped.h"
2414 /* 8-bit encodings */
2415 #include "iso8859_1.h"
2416 #include "iso8859_2.h"
2417 -#include "iso8859_3.h"
2418 -#include "iso8859_4.h"
2419 -#include "iso8859_5.h"
2420 -#include "iso8859_6.h"
2421 -#include "iso8859_7.h"
2422 -#include "iso8859_8.h"
2423 -#include "iso8859_9.h"
2424 -#include "iso8859_10.h"
2425 -#include "iso8859_11.h"
2426 -#include "iso8859_13.h"
2427 -#include "iso8859_14.h"
2428 #include "iso8859_15.h"
2429 -#include "iso8859_16.h"
2431 -#include "koi8_u.h"
2432 -#include "koi8_ru.h"
2434 -#include "cp1251.h"
2435 -#include "cp1252.h"
2436 -#include "cp1253.h"
2437 -#include "cp1254.h"
2438 -#include "cp1255.h"
2439 -#include "cp1256.h"
2440 -#include "cp1257.h"
2441 -#include "cp1258.h"
2445 -#include "mac_roman.h"
2446 -#include "mac_centraleurope.h"
2447 -#include "mac_iceland.h"
2448 -#include "mac_croatian.h"
2449 -#include "mac_romania.h"
2450 -#include "mac_cyrillic.h"
2451 -#include "mac_ukraine.h"
2452 -#include "mac_greek.h"
2453 -#include "mac_turkish.h"
2454 -#include "mac_hebrew.h"
2455 -#include "mac_arabic.h"
2456 -#include "mac_thai.h"
2457 -#include "hp_roman8.h"
2458 -#include "nextstep.h"
2459 -#include "armscii_8.h"
2460 -#include "georgian_academy.h"
2461 -#include "georgian_ps.h"
2462 -#include "koi8_t.h"
2464 -#include "mulelao.h"
2465 -#include "cp1133.h"
2466 -#include "tis620.h"
2468 -#include "viscii.h"
2471 -/* CJK character sets [CCS = coded character set] [CJKV.INF chapter 3] */
2474 - unsigned short indx; /* index into big table */
2475 - unsigned short used; /* bitmask of used entries */
2478 -#include "iso646_jp.h"
2479 -#include "jisx0201.h"
2480 -#include "jisx0208.h"
2481 -#include "jisx0212.h"
2483 -#include "iso646_cn.h"
2484 -#include "gb2312.h"
2485 -#include "isoir165.h"
2486 -/*#include "gb12345.h"*/
2488 -#include "cns11643.h"
2491 -#include "ksc5601.h"
2492 -#include "johab_hangul.h"
2494 -/* CJK encodings [CES = character encoding scheme] [CJKV.INF chapter 4] */
2496 -#include "euc_jp.h"
2499 -#include "iso2022_jp.h"
2500 -#include "iso2022_jp1.h"
2501 -#include "iso2022_jp2.h"
2503 -#include "euc_cn.h"
2504 -#include "ces_gbk.h"
2506 -#include "gb18030.h"
2507 -#include "iso2022_cn.h"
2508 -#include "iso2022_cnext.h"
2510 -#include "euc_tw.h"
2511 -#include "ces_big5.h"
2513 -#include "big5hkscs1999.h"
2514 -#include "big5hkscs2001.h"
2515 -#include "big5hkscs2004.h"
2517 -#include "euc_kr.h"
2520 -#include "iso2022_kr.h"
2522 -/* Encodings used by system dependent locales. */
2528 -#include "cp1046.h"
2529 -#include "cp1124.h"
2530 -#include "cp1129.h"
2531 -#include "cp1161.h"
2532 -#include "cp1162.h"
2533 -#include "cp1163.h"
2537 -#include "dec_kanji.h"
2538 -#include "dec_hanyu.h"
2556 -#include "cp1125.h"
2560 -#include "euc_jisx0213.h"
2561 -#include "shift_jisx0213.h"
2562 -#include "iso2022_jp3.h"
2563 -#include "big5_2003.h"
2564 -#include "tds565.h"
2565 -#include "atarist.h"
2566 -#include "riscos1.h"
2569 diff -urN libiconv-1.11.old/lib/encodings.def libiconv-1.11.new/lib/encodings.def
2570 --- libiconv-1.11.old/lib/encodings.def 2006-05-18 14:43:55.000000000 +0200
2571 +++ libiconv-1.11.new/lib/encodings.def 2007-11-11 14:59:15.000000000 +0100
2572 @@ -161,16 +161,6 @@
2574 { ucs4swapped_mbtowc, NULL }, { ucs4swapped_wctomb, NULL })
2576 -DEFENCODING(( "C99",
2579 - { c99_mbtowc, NULL }, { c99_wctomb, NULL })
2581 -DEFENCODING(( "JAVA",
2584 - { java_mbtowc, NULL }, { java_wctomb, NULL })
2586 /* Standard 8-bit encodings */
2588 DEFENCODING(( "ISO-8859-1", /* IANA */
2589 @@ -203,148 +193,6 @@
2591 { iso8859_2_mbtowc, NULL }, { iso8859_2_wctomb, NULL })
2593 -DEFENCODING(( "ISO-8859-3", /* IANA */
2594 - "ISO_8859-3", /* IANA */
2595 - "ISO_8859-3:1988", /* IANA */
2596 - "ISO-IR-109", /* IANA */
2597 - "LATIN3", /* IANA */
2599 - "csISOLatin3", /* IANA */
2600 - "ISO8859-3", /* X11R6.4, glibc, FreeBSD */
2601 - /*"ISO8859_3", JDK 1.1 */
2602 - /*"CP28593", Windows */
2605 - { iso8859_3_mbtowc, NULL }, { iso8859_3_wctomb, NULL })
2607 -DEFENCODING(( "ISO-8859-4", /* IANA */
2608 - "ISO_8859-4", /* IANA */
2609 - "ISO_8859-4:1988", /* IANA */
2610 - "ISO-IR-110", /* IANA */
2611 - "LATIN4", /* IANA */
2613 - "csISOLatin4", /* IANA */
2614 - "ISO8859-4", /* X11R6.4, glibc, FreeBSD */
2615 - /*"ISO8859_4", JDK 1.1 */
2616 - /*"CP28594", Windows */
2619 - { iso8859_4_mbtowc, NULL }, { iso8859_4_wctomb, NULL })
2621 -DEFENCODING(( "ISO-8859-5", /* IANA */
2622 - "ISO_8859-5", /* IANA */
2623 - "ISO_8859-5:1988", /* IANA */
2624 - "ISO-IR-144", /* IANA */
2625 - "CYRILLIC", /* IANA */
2626 - "csISOLatinCyrillic", /* IANA */
2627 - "ISO8859-5", /* X11R6.4, glibc, FreeBSD */
2628 - /*"ISO8859_5", JDK 1.1 */
2629 - /*"CP28595", Windows */
2632 - { iso8859_5_mbtowc, NULL }, { iso8859_5_wctomb, NULL })
2634 -DEFENCODING(( "ISO-8859-6", /* IANA */
2635 - "ISO_8859-6", /* IANA */
2636 - "ISO_8859-6:1987", /* IANA */
2637 - "ISO-IR-127", /* IANA */
2638 - "ECMA-114", /* IANA */
2639 - "ASMO-708", /* IANA */
2640 - "ARABIC", /* IANA */
2641 - "csISOLatinArabic", /* IANA */
2642 - "ISO8859-6", /* X11R6.4, glibc, FreeBSD */
2643 - /*"ISO8859_6", JDK 1.1 */
2644 - /*"CP28596", Windows */
2647 - { iso8859_6_mbtowc, NULL }, { iso8859_6_wctomb, NULL })
2649 -DEFENCODING(( "ISO-8859-7", /* IANA, RFC 1947 */
2650 - "ISO_8859-7", /* IANA */
2651 - "ISO_8859-7:1987", /* IANA */
2652 - "ISO_8859-7:2003",
2653 - "ISO-IR-126", /* IANA */
2654 - "ECMA-118", /* IANA */
2655 - "ELOT_928", /* IANA */
2656 - "GREEK8", /* IANA */
2657 - "GREEK", /* IANA */
2658 - "csISOLatinGreek", /* IANA */
2659 - "ISO8859-7", /* X11R6.4, glibc, FreeBSD */
2660 - /*"ISO8859_7", JDK 1.1 */
2661 - /*"CP28597", Windows */
2664 - { iso8859_7_mbtowc, NULL }, { iso8859_7_wctomb, NULL })
2666 -DEFENCODING(( "ISO-8859-8", /* IANA */
2667 - "ISO_8859-8", /* IANA */
2668 - "ISO_8859-8:1988", /* IANA */
2669 - "ISO-IR-138", /* IANA */
2670 - "HEBREW", /* IANA */
2671 - "csISOLatinHebrew", /* IANA */
2672 - "ISO8859-8", /* X11R6.4, glibc, FreeBSD */
2673 - /*"ISO8859_8", JDK 1.1 */
2674 - /*"CP28598", Windows */
2675 - /*"CP38598", Windows */
2678 - { iso8859_8_mbtowc, NULL }, { iso8859_8_wctomb, NULL })
2680 -DEFENCODING(( "ISO-8859-9", /* IANA */
2681 - "ISO_8859-9", /* IANA */
2682 - "ISO_8859-9:1989", /* IANA */
2683 - "ISO-IR-148", /* IANA */
2684 - "LATIN5", /* IANA */
2686 - "csISOLatin5", /* IANA */
2687 - "ISO8859-9", /* X11R6.4, glibc, FreeBSD */
2688 - /*"ISO8859_9", JDK 1.1 */
2689 - /*"CP28599", Windows */
2692 - { iso8859_9_mbtowc, NULL }, { iso8859_9_wctomb, NULL })
2694 -DEFENCODING(( "ISO-8859-10", /* IANA */
2696 - "ISO_8859-10:1992", /* IANA */
2697 - "ISO-IR-157", /* IANA */
2698 - "LATIN6", /* IANA */
2700 - "csISOLatin6", /* IANA */
2701 - "ISO8859-10", /* X11R6.4, glibc, FreeBSD */
2704 - { iso8859_10_mbtowc, NULL }, { iso8859_10_wctomb, NULL })
2706 -DEFENCODING(( "ISO-8859-11", /* glibc */
2708 - "ISO8859-11", /* X11R6.7, glibc */
2711 - { iso8859_11_mbtowc, NULL }, { iso8859_11_wctomb, NULL })
2713 -DEFENCODING(( "ISO-8859-13", /* IANA, glibc */
2715 - "ISO-IR-179", /* glibc */
2716 - "LATIN7", /* glibc */
2718 - "ISO8859-13", /* glibc, FreeBSD */
2721 - { iso8859_13_mbtowc, NULL }, { iso8859_13_wctomb, NULL })
2723 -DEFENCODING(( "ISO-8859-14", /* IANA, glibc */
2724 - "ISO_8859-14", /* IANA */
2725 - "ISO_8859-14:1998", /* IANA, glibc */
2726 - "ISO-IR-199", /* IANA */
2727 - "LATIN8", /* IANA, glibc */
2728 - "L8", /* IANA, glibc */
2729 - "ISO-CELTIC", /* IANA */
2730 - "ISO8859-14", /* glibc, FreeBSD */
2733 - { iso8859_14_mbtowc, NULL }, { iso8859_14_wctomb, NULL })
2735 DEFENCODING(( "ISO-8859-15", /* IANA, glibc */
2736 "ISO_8859-15", /* IANA */
2737 "ISO_8859-15:1998", /* glibc */
2738 @@ -356,17 +204,6 @@
2740 { iso8859_15_mbtowc, NULL }, { iso8859_15_wctomb, NULL })
2742 -DEFENCODING(( "ISO-8859-16", /* IANA */
2743 - "ISO_8859-16", /* IANA */
2744 - "ISO_8859-16:2001", /* IANA */
2745 - "ISO-IR-226", /* IANA */
2746 - "LATIN10", /* IANA */
2748 - "ISO8859-16", /* glibc, FreeBSD */
2751 - { iso8859_16_mbtowc, NULL }, { iso8859_16_wctomb, NULL })
2753 DEFENCODING(( "KOI8-R", /* IANA, RFC 1489, X11R6.4, JDK 1.1 */
2754 "csKOI8R", /* IANA */
2755 /*"CP20866", Windows */
2756 @@ -374,16 +211,6 @@
2758 { koi8_r_mbtowc, NULL }, { koi8_r_wctomb, NULL })
2760 -DEFENCODING(( "KOI8-U", /* IANA, RFC 2319 */
2763 - { koi8_u_mbtowc, NULL }, { koi8_u_wctomb, NULL })
2765 -DEFENCODING(( "KOI8-RU",
2768 - { koi8_ru_mbtowc, NULL }, { koi8_ru_wctomb, NULL })
2770 /* Windows 8-bit encodings */
2772 DEFENCODING(( "CP1250", /* JDK 1.1 */
2773 @@ -393,61 +220,6 @@
2775 { cp1250_mbtowc, NULL }, { cp1250_wctomb, NULL })
2777 -DEFENCODING(( "CP1251", /* JDK 1.1 */
2778 - "WINDOWS-1251", /* IANA */
2782 - { cp1251_mbtowc, NULL }, { cp1251_wctomb, NULL })
2784 -DEFENCODING(( "CP1252", /* JDK 1.1 */
2785 - "WINDOWS-1252", /* IANA */
2789 - { cp1252_mbtowc, NULL }, { cp1252_wctomb, NULL })
2791 -DEFENCODING(( "CP1253", /* JDK 1.1 */
2792 - "WINDOWS-1253", /* IANA */
2796 - { cp1253_mbtowc, NULL }, { cp1253_wctomb, NULL })
2798 -DEFENCODING(( "CP1254", /* JDK 1.1 */
2799 - "WINDOWS-1254", /* IANA */
2803 - { cp1254_mbtowc, NULL }, { cp1254_wctomb, NULL })
2805 -DEFENCODING(( "CP1255", /* JDK 1.1 */
2806 - "WINDOWS-1255", /* IANA */
2810 - { cp1255_mbtowc, cp1255_flushwc }, { cp1255_wctomb, NULL })
2812 -DEFENCODING(( "CP1256", /* JDK 1.1 */
2813 - "WINDOWS-1256", /* IANA */
2817 - { cp1256_mbtowc, NULL }, { cp1256_wctomb, NULL })
2819 -DEFENCODING(( "CP1257", /* JDK 1.1 */
2820 - "WINDOWS-1257", /* IANA */
2824 - { cp1257_mbtowc, NULL }, { cp1257_wctomb, NULL })
2826 -DEFENCODING(( "CP1258", /* JDK 1.1 */
2827 - "WINDOWS-1258", /* IANA */
2830 - { cp1258_mbtowc, cp1258_flushwc }, { cp1258_wctomb, NULL })
2832 /* DOS 8-bit encodings */
2834 DEFENCODING(( "CP850", /* IANA, JDK 1.1 */
2835 @@ -458,431 +230,3 @@
2837 { cp850_mbtowc, NULL }, { cp850_wctomb, NULL })
2839 -DEFENCODING(( "CP862", /* IANA, JDK 1.1 */
2840 - "IBM862", /* IANA */
2842 - "csPC862LatinHebrew", /* IANA */
2845 - { cp862_mbtowc, NULL }, { cp862_wctomb, NULL })
2847 -DEFENCODING(( "CP866", /* IANA, JDK 1.1 */
2848 - "IBM866", /* IANA */
2850 - "csIBM866", /* IANA */
2853 - { cp866_mbtowc, NULL }, { cp866_wctomb, NULL })
2855 -/* Macintosh 8-bit encodings */
2857 -DEFENCODING(( "MacRoman", /* JDK 1.1 */
2858 - /* This is the best table for MACINTOSH. The ones */
2859 - /* in glibc and FreeBSD-iconv are bad quality. */
2860 - "MACINTOSH", /* IANA */
2862 - "csMacintosh", /* IANA */
2863 - /*"CP10000", Windows */
2866 - { mac_roman_mbtowc, NULL }, { mac_roman_wctomb, NULL })
2868 -DEFENCODING(( "MacCentralEurope", /* JDK 1.1 */
2869 - /*"CP10029", Windows */
2871 - mac_centraleurope,
2872 - { mac_centraleurope_mbtowc, NULL }, { mac_centraleurope_wctomb, NULL })
2874 -DEFENCODING(( "MacIceland", /* JDK 1.1 */
2875 - /*"CP10079", Windows */
2878 - { mac_iceland_mbtowc, NULL }, { mac_iceland_wctomb, NULL })
2880 -DEFENCODING(( "MacCroatian", /* JDK 1.1 */
2881 - /*"CP10082", Windows */
2884 - { mac_croatian_mbtowc, NULL }, { mac_croatian_wctomb, NULL })
2886 -DEFENCODING(( "MacRomania", /* JDK 1.1 */
2887 - /*"CP10010", Windows */
2890 - { mac_romania_mbtowc, NULL }, { mac_romania_wctomb, NULL })
2892 -DEFENCODING(( "MacCyrillic", /* JDK 1.1 */
2893 - /*"CP10007", Windows */
2896 - { mac_cyrillic_mbtowc, NULL }, { mac_cyrillic_wctomb, NULL })
2898 -DEFENCODING(( "MacUkraine", /* JDK 1.1 */
2899 - /*"CP10017", Windows */
2902 - { mac_ukraine_mbtowc, NULL }, { mac_ukraine_wctomb, NULL })
2904 -DEFENCODING(( "MacGreek", /* JDK 1.1 */
2905 - /*"CP10006", Windows */
2908 - { mac_greek_mbtowc, NULL }, { mac_greek_wctomb, NULL })
2910 -DEFENCODING(( "MacTurkish", /* JDK 1.1 */
2911 - /*"CP10081", Windows */
2914 - { mac_turkish_mbtowc, NULL }, { mac_turkish_wctomb, NULL })
2916 -DEFENCODING(( "MacHebrew", /* JDK 1.1 */
2917 - /*"CP10005", Windows */
2920 - { mac_hebrew_mbtowc, NULL }, { mac_hebrew_wctomb, NULL })
2922 -DEFENCODING(( "MacArabic", /* JDK 1.1 */
2923 - /*"CP10004", Windows */
2926 - { mac_arabic_mbtowc, NULL }, { mac_arabic_wctomb, NULL })
2928 -DEFENCODING(( "MacThai", /* JDK 1.1 */
2929 - /*"CP10021", Windows */
2932 - { mac_thai_mbtowc, NULL }, { mac_thai_wctomb, NULL })
2934 -/* Other platform specific 8-bit encodings */
2936 -DEFENCODING(( "HP-ROMAN8", /* IANA, X11R6.4 */
2937 - "ROMAN8", /* IANA */
2939 - "csHPRoman8", /* IANA */
2942 - { hp_roman8_mbtowc, NULL }, { hp_roman8_wctomb, NULL })
2944 -DEFENCODING(( "NEXTSTEP",
2947 - { nextstep_mbtowc, NULL }, { nextstep_wctomb, NULL })
2949 -/* Regional 8-bit encodings used for a single language */
2951 -DEFENCODING(( "ARMSCII-8",
2954 - { armscii_8_mbtowc, NULL }, { armscii_8_wctomb, NULL })
2956 -DEFENCODING(( "GEORGIAN-ACADEMY",
2959 - { georgian_academy_mbtowc, NULL }, { georgian_academy_wctomb, NULL })
2961 -DEFENCODING(( "GEORGIAN-PS",
2964 - { georgian_ps_mbtowc, NULL }, { georgian_ps_wctomb, NULL })
2966 -DEFENCODING(( "KOI8-T",
2969 - { koi8_t_mbtowc, NULL }, { koi8_t_wctomb, NULL })
2971 -DEFENCODING(( "PT154", /* IANA, glibc */
2972 - "PTCP154", /* IANA */
2973 - "CP154", /* IANA */
2974 - "CYRILLIC-ASIAN", /* IANA */
2975 - "csPTCP154", /* IANA */
2978 - { pt154_mbtowc, NULL }, { pt154_wctomb, NULL })
2980 -DEFENCODING(( "MULELAO-1",
2983 - { mulelao_mbtowc, NULL }, { mulelao_wctomb, NULL })
2985 -DEFENCODING(( "CP1133",
2989 - { cp1133_mbtowc, NULL }, { cp1133_wctomb, NULL })
2991 -DEFENCODING(( "TIS-620", /* IANA */
2992 - "TIS620", /* glibc */
2993 - "TIS620-0", /* glibc */
2994 - "TIS620.2529-1", /* glibc */
2995 - "TIS620.2533-0", /* glibc */
2997 - "ISO-IR-166", /* glibc */
3000 - { tis620_mbtowc, NULL }, { tis620_wctomb, NULL })
3002 -DEFENCODING(( "CP874", /* JDK 1.1 */
3006 - { cp874_mbtowc, NULL }, { cp874_wctomb, NULL })
3008 -DEFENCODING(( "VISCII", /* IANA, RFC 1456 */
3010 - "csVISCII", /* IANA */
3013 - { viscii_mbtowc, NULL }, { viscii_wctomb, NULL })
3015 -DEFENCODING(( "TCVN",
3018 - "TCVN5712-1:1993",
3021 - { tcvn_mbtowc, tcvn_flushwc }, { tcvn_wctomb, NULL })
3023 -/* CJK character sets (not documented) */
3025 -DEFENCODING(( "JIS_C6220-1969-RO", /* IANA */
3026 - "ISO646-JP", /* IANA */
3027 - "ISO-IR-14", /* IANA */
3029 - "csISO14JISC6220ro", /* IANA */
3032 - { iso646_jp_mbtowc, NULL }, { iso646_jp_wctomb, NULL })
3034 -DEFENCODING(( "JIS_X0201", /* IANA */
3036 - "X0201", /* IANA */
3037 - "csHalfWidthKatakana", /* IANA */
3038 - /*"JISX0201.1976-0", X11R6.4 */
3039 - /*"JIS0201", JDK 1.1 */
3042 - { jisx0201_mbtowc, NULL }, { jisx0201_wctomb, NULL })
3044 -DEFENCODING(( "JIS_X0208",
3045 - "JIS_X0208-1983", /* IANA */
3048 - "X0208", /* IANA */
3049 - "ISO-IR-87", /* IANA */
3050 - "JIS_C6226-1983", /* IANA */
3051 - "csISO87JISX0208", /* IANA */
3052 - /*"JISX0208.1983-0", X11R6.4 */
3053 - /*"JISX0208.1990-0", X11R6.4 */
3054 - /*"JIS0208", JDK 1.1 */
3057 - { jisx0208_mbtowc, NULL }, { jisx0208_wctomb, NULL })
3059 -DEFENCODING(( "JIS_X0212",
3060 - "JIS_X0212.1990-0",
3061 - "JIS_X0212-1990", /* IANA */
3062 - "X0212", /* IANA */
3063 - "ISO-IR-159", /* IANA */
3064 - "csISO159JISX02121990", /* IANA */
3065 - /*"JISX0212.1990-0", X11R6.4 */
3066 - /*"JIS0212", JDK 1.1 */
3069 - { jisx0212_mbtowc, NULL }, { jisx0212_wctomb, NULL })
3071 -DEFENCODING(( "GB_1988-80", /* IANA */
3072 - "ISO646-CN", /* IANA */
3073 - "ISO-IR-57", /* IANA */
3075 - "csISO57GB1988", /* IANA */
3078 - { iso646_cn_mbtowc, NULL }, { iso646_cn_wctomb, NULL })
3080 -DEFENCODING(( "GB_2312-80", /* IANA */
3081 - "ISO-IR-58", /* IANA */
3082 - "csISO58GB231280", /* IANA */
3083 - "CHINESE", /* IANA */
3084 - /*"GB2312.1980-0", X11R6.4 */
3087 - { gb2312_mbtowc, NULL }, { gb2312_wctomb, NULL })
3089 -DEFENCODING(( "ISO-IR-165",
3090 - "CN-GB-ISOIR165", /* RFC 1922 */
3093 - { isoir165_mbtowc, NULL }, { isoir165_wctomb, NULL })
3095 -DEFENCODING(( "KSC_5601", /* IANA */
3096 - "KS_C_5601-1987", /* IANA */
3097 - "KS_C_5601-1989", /* IANA */
3098 - "ISO-IR-149", /* IANA */
3099 - "csKSC56011987", /* IANA */
3100 - "KOREAN", /* IANA */
3101 - /*"KSC5601.1987-0", X11R6.4 */
3102 - /*"KSX1001:1992", Ken Lunde */
3105 - { ksc5601_mbtowc, NULL }, { ksc5601_wctomb, NULL })
3107 -/* CJK encodings */
3109 -DEFENCODING(( "EUC-JP", /* IANA */
3110 - "EUCJP", /* glibc */
3111 - "Extended_UNIX_Code_Packed_Format_for_Japanese", /* IANA */
3112 - "csEUCPkdFmtJapanese", /* IANA */
3113 - /*"EUC_JP", JDK 1.1 */
3114 - /*"CP51932", Windows */
3117 - { euc_jp_mbtowc, NULL }, { euc_jp_wctomb, NULL })
3119 -DEFENCODING(( "SHIFT_JIS", /* IANA */
3120 - "SHIFT-JIS", /* glibc */
3121 - "SJIS", /* JDK 1.1 */
3122 - "MS_KANJI", /* IANA */
3123 - "csShiftJIS", /* IANA */
3126 - { sjis_mbtowc, NULL }, { sjis_wctomb, NULL })
3128 -DEFENCODING(( "CP932", /* glibc */
3131 - { cp932_mbtowc, NULL }, { cp932_wctomb, NULL })
3133 -DEFENCODING(( "ISO-2022-JP", /* IANA, RFC 1468 */
3134 - "csISO2022JP", /* IANA */
3135 - /*"ISO2022JP", JDK 1.1 */
3138 - { iso2022_jp_mbtowc, NULL }, { iso2022_jp_wctomb, iso2022_jp_reset })
3140 -DEFENCODING(( "ISO-2022-JP-1", /* RFC 2237 */
3143 - { iso2022_jp1_mbtowc, NULL }, { iso2022_jp1_wctomb, iso2022_jp1_reset })
3145 -DEFENCODING(( "ISO-2022-JP-2", /* IANA, RFC 1554 */
3146 - "csISO2022JP2", /* IANA */
3149 - { iso2022_jp2_mbtowc, NULL }, { iso2022_jp2_wctomb, iso2022_jp2_reset })
3151 -DEFENCODING(( "EUC-CN", /* glibc */
3152 - "EUCCN", /* glibc */
3153 - "GB2312", /* IANA */
3154 - "CN-GB", /* RFC 1922 */
3155 - "csGB2312", /* IANA */
3156 - /*"EUC_CN", JDK 1.1 */
3157 - /*"CP51936", Windows */
3160 - { euc_cn_mbtowc, NULL }, { euc_cn_wctomb, NULL })
3162 -DEFENCODING(( "GBK", /* IANA, JDK 1.1 */
3165 - { ces_gbk_mbtowc, NULL }, { ces_gbk_wctomb, NULL })
3167 -DEFENCODING(( "CP936", /* IANA */
3168 - "MS936", /* IANA */
3169 - "WINDOWS-936", /* IANA */
3172 - { cp936_mbtowc, NULL }, { cp936_wctomb, NULL })
3174 -DEFENCODING(( "GB18030", /* IANA, glibc */
3175 - /*"CP54936", Windows */
3178 - { gb18030_mbtowc, NULL }, { gb18030_wctomb, NULL })
3180 -DEFENCODING(( "ISO-2022-CN", /* IANA, RFC 1922 */
3182 - /*"ISO2022CN", JDK 1.1 */
3185 - { iso2022_cn_mbtowc, NULL }, { iso2022_cn_wctomb, iso2022_cn_reset })
3187 -DEFENCODING(( "ISO-2022-CN-EXT", /* IANA, RFC 1922 */
3190 - { iso2022_cn_ext_mbtowc, NULL }, { iso2022_cn_ext_wctomb, iso2022_cn_ext_reset })
3192 -DEFENCODING(( "HZ", /* RFC 1843 */
3193 - "HZ-GB-2312", /* IANA, RFC 1842 */
3196 - { hz_mbtowc, NULL }, { hz_wctomb, hz_reset })
3198 -DEFENCODING(( "EUC-TW", /* glibc */
3199 - "EUCTW", /* glibc */
3201 - /*"EUC_TW", JDK 1.1 */
3202 - /*"CP51950", Windows */
3205 - { euc_tw_mbtowc, NULL }, { euc_tw_wctomb, NULL })
3207 -DEFENCODING(( "BIG5", /* IANA, JDK 1.1 */
3208 - "BIG-5", /* glibc */
3209 - "BIG-FIVE", /* glibc */
3210 - "BIGFIVE", /* glibc */
3211 - "CN-BIG5", /* RFC 1922 */
3212 - "csBig5", /* IANA */
3215 - { ces_big5_mbtowc, NULL }, { ces_big5_wctomb, NULL })
3217 -DEFENCODING(( "CP950", /* JDK 1.1 */
3220 - { cp950_mbtowc, NULL }, { cp950_wctomb, NULL })
3222 -DEFENCODING(( "BIG5-HKSCS:1999",
3225 - { big5hkscs1999_mbtowc, big5hkscs1999_flushwc }, { big5hkscs1999_wctomb, big5hkscs1999_reset })
3227 -DEFENCODING(( "BIG5-HKSCS:2001",
3230 - { big5hkscs2001_mbtowc, big5hkscs2001_flushwc }, { big5hkscs2001_wctomb, big5hkscs2001_reset })
3232 -DEFENCODING(( "BIG5-HKSCS", /* IANA */
3233 - "BIG5HKSCS", /* glibc */
3234 - "BIG5-HKSCS:2004",
3237 - { big5hkscs2004_mbtowc, big5hkscs2004_flushwc }, { big5hkscs2004_wctomb, big5hkscs2004_reset })
3239 -DEFENCODING(( "EUC-KR", /* IANA, RFC 1557 */
3240 - "EUCKR", /* glibc */
3241 - "csEUCKR", /* IANA */
3242 - /*"EUC_KR", JDK 1.1 */
3243 - /*"CP51949", Windows */
3246 - { euc_kr_mbtowc, NULL }, { euc_kr_wctomb, NULL })
3248 -DEFENCODING(( "CP949", /* JDK 1.1 */
3249 - "UHC", /* glibc */
3252 - { cp949_mbtowc, NULL }, { cp949_wctomb, NULL })
3254 -DEFENCODING(( "JOHAB", /* glibc */
3255 - "CP1361", /* glibc */
3258 - { johab_mbtowc, NULL }, { johab_wctomb, NULL })
3260 -DEFENCODING(( "ISO-2022-KR", /* IANA, RFC 1557 */
3261 - "csISO2022KR", /* IANA */
3262 - /*"ISO2022KR", JDK 1.1 */
3265 - { iso2022_kr_mbtowc, NULL }, { iso2022_kr_wctomb, iso2022_kr_reset })
3267 diff -urN libiconv-1.11.old/lib/encodings_dos.def libiconv-1.11.new/lib/encodings_dos.def
3268 --- libiconv-1.11.old/lib/encodings_dos.def 2005-05-19 18:19:21.000000000 +0200
3269 +++ libiconv-1.11.new/lib/encodings_dos.def 2007-11-11 14:57:20.000000000 +0100
3272 { cp437_mbtowc, NULL }, { cp437_wctomb, NULL })
3274 -DEFENCODING(( "CP737", /* JDK 1.1 */
3277 - { cp737_mbtowc, NULL }, { cp737_wctomb, NULL })
3279 -DEFENCODING(( "CP775", /* IANA, JDK 1.1 */
3280 - "IBM775", /* IANA */
3281 - "csPC775Baltic", /* IANA */
3284 - { cp775_mbtowc, NULL }, { cp775_wctomb, NULL })
3286 -DEFENCODING(( "CP852", /* IANA, JDK 1.1 */
3287 - "IBM852", /* IANA */
3289 - "csPCp852", /* IANA */
3292 - { cp852_mbtowc, NULL }, { cp852_wctomb, NULL })
3294 -DEFENCODING(( "CP853",
3297 - { cp853_mbtowc, NULL }, { cp853_wctomb, NULL })
3299 -DEFENCODING(( "CP855", /* IANA, JDK 1.1 */
3300 - "IBM855", /* IANA */
3302 - "csIBM855", /* IANA */
3305 - { cp855_mbtowc, NULL }, { cp855_wctomb, NULL })
3307 -DEFENCODING(( "CP857", /* IANA, JDK 1.1 */
3308 - "IBM857", /* IANA */
3310 - "csIBM857", /* IANA */
3313 - { cp857_mbtowc, NULL }, { cp857_wctomb, NULL })
3315 -DEFENCODING(( "CP858", /* JDK 1.1.7 */
3318 - { cp858_mbtowc, NULL }, { cp858_wctomb, NULL })
3320 -DEFENCODING(( "CP860", /* IANA, JDK 1.1 */
3321 - "IBM860", /* IANA */
3323 - "csIBM860", /* IANA */
3326 - { cp860_mbtowc, NULL }, { cp860_wctomb, NULL })
3328 -DEFENCODING(( "CP861", /* IANA, JDK 1.1 */
3329 - "IBM861", /* IANA */
3331 - "CP-IS", /* IANA */
3332 - "csIBM861", /* IANA */
3335 - { cp861_mbtowc, NULL }, { cp861_wctomb, NULL })
3337 -DEFENCODING(( "CP863", /* IANA, JDK 1.1 */
3338 - "IBM863", /* IANA */
3340 - "csIBM863", /* IANA */
3343 - { cp863_mbtowc, NULL }, { cp863_wctomb, NULL })
3345 -DEFENCODING(( "CP864", /* IANA, JDK 1.1 */
3346 - "IBM864", /* IANA */
3347 - "csIBM864", /* IANA */
3350 - { cp864_mbtowc, NULL }, { cp864_wctomb, NULL })
3352 -DEFENCODING(( "CP865", /* IANA, JDK 1.1 */
3353 - "IBM865", /* IANA */
3355 - "csIBM865", /* IANA */
3358 - { cp865_mbtowc, NULL }, { cp865_wctomb, NULL })
3360 -DEFENCODING(( "CP869", /* IANA, JDK 1.1 */
3361 - "IBM869", /* IANA */
3363 - "CP-GR", /* IANA */
3364 - "csIBM869", /* IANA */
3367 - { cp869_mbtowc, NULL }, { cp869_wctomb, NULL })
3369 -DEFENCODING(( "CP1125", /* ICU */
3372 - { cp1125_mbtowc, NULL }, { cp1125_wctomb, NULL })
3373 diff -urN libiconv-1.11.old/lib/loop_unicode.h libiconv-1.11.new/lib/loop_unicode.h
3374 --- libiconv-1.11.old/lib/loop_unicode.h 2006-01-23 14:16:12.000000000 +0100
3375 +++ libiconv-1.11.new/lib/loop_unicode.h 2007-11-11 14:28:10.000000000 +0100
3377 static int unicode_transliterate (conv_t cd, ucs4_t wc,
3378 unsigned char* outptr, size_t outleft)
3381 if (cd->oflags & HAVE_HANGUL_JAMO) {
3382 - /* Decompose Hangul into Jamo. Use double-width Jamo (contained
3383 + /-* Decompose Hangul into Jamo. Use double-width Jamo (contained
3384 in all Korean encodings and ISO-2022-JP-2), not half-width Jamo
3385 - (contained in Unicode only). */
3386 + (contained in Unicode only). *-/
3388 int ret = johab_hangul_decompose(cd,buf,wc);
3389 if (ret != RET_ILUNI) {
3390 - /* we know 1 <= ret <= 3 */
3391 + /-* we know 1 <= ret <= 3 *-/
3392 state_t backup_state = cd->ostate;
3393 unsigned char* backup_outptr = outptr;
3394 size_t backup_outleft = outleft;
3399 - /* Try to use a variant, but postfix it with
3400 + /-* Try to use a variant, but postfix it with
3401 U+303E IDEOGRAPHIC VARIATION INDICATOR
3402 - (cf. Ken Lunde's "CJKV information processing", p. 188). */
3403 + (cf. Ken Lunde's "CJKV information processing", p. 188). *-/
3407 @@ -105,20 +106,20 @@
3410 if (wc >= 0x2018 && wc <= 0x201a) {
3411 - /* Special case for quotation marks 0x2018, 0x2019, 0x201a */
3412 + /-* Special case for quotation marks 0x2018, 0x2019, 0x201a *-/
3414 (cd->oflags & HAVE_QUOTATION_MARKS
3415 ? (wc == 0x201a ? 0x2018 : wc)
3416 : (cd->oflags & HAVE_ACCENTS
3417 - ? (wc==0x2019 ? 0x00b4 : 0x0060) /* use accents */
3418 - : 0x0027 /* use apostrophe */
3419 + ? (wc==0x2019 ? 0x00b4 : 0x0060) /-* use accents *-/
3420 + : 0x0027 /-* use apostrophe *-/
3422 int outcount = cd->ofuncs.xxx_wctomb(cd,outptr,substitute,outleft);
3423 if (outcount != RET_ILUNI)
3427 - /* Use the transliteration table. */
3428 + /-* Use the transliteration table. *-/
3429 int indx = translit_index(wc);
3431 const unsigned int * cp = &translit_data[indx];
3434 sub_outcount = cd->ofuncs.xxx_wctomb(cd,outptr,cp[i],outleft);
3435 if (sub_outcount == RET_ILUNI)
3436 - /* Recursive transliteration. */
3437 + /-* Recursive transliteration. *-/
3438 sub_outcount = unicode_transliterate(cd,cp[i],outptr,outleft);
3439 if (sub_outcount <= RET_ILUNI)
3440 goto translit_failed;
3442 return RET_TOOSMALL;