--- /dev/null
+diff -ruN libiconv/lib/aliases.h libiconv.new/lib/aliases.h
+--- libiconv/lib/aliases.h 2009-06-30 22:51:58.000000000 +0200
++++ libiconv.new/lib/aliases.h 2009-09-02 23:20:33.000000000 +0200
+@@ -808,852 +808,852 @@
+ {
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 308 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str7, ei_sjis},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str7, ei_sjis},
+ {-1},
+ #line 288 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str9, ei_iso646_cn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str9, ei_iso646_cn},
+ {-1},
+ #line 209 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str11, ei_cp1131},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str11, ei_cp1131},
+ #line 353 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str12, ei_johab},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str12, ei_johab},
+ #line 207 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str13, ei_cp866},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str13, ei_cp866},
+ {-1},
+ #line 244 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_cp1133},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str15, ei_cp1133},
+ {-1}, {-1},
+ #line 174 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str18, ei_cp1251},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str18, ei_cp1251},
+ #line 205 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str19, ei_cp866},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str19, ei_cp866},
+ #line 189 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, ei_cp1256},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str20, ei_cp1256},
+ #line 203 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str21, ei_cp862},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str21, ei_cp862},
+ #line 180 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str22, ei_cp1253},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str22, ei_cp1253},
+ {-1},
+ #line 323 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str24, ei_cp936},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str24, ei_cp936},
+ {-1},
+ #line 186 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str26, ei_cp1255},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str26, ei_cp1255},
+ #line 201 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, ei_cp862},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str27, ei_cp862},
+ #line 177 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str28, ei_cp1252},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str28, ei_cp1252},
+ {-1},
+ #line 51 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, ei_c99},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str30, ei_c99},
+ {-1},
+ #line 311 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str32, ei_cp932},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str32, ei_cp932},
+ {-1},
+ #line 195 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, ei_cp1258},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str34, ei_cp1258},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 57 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str40, ei_iso8859_1},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str40, ei_iso8859_1},
+ #line 60 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str41, ei_iso8859_1},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str41, ei_iso8859_1},
+ #line 134 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str42, ei_iso8859_10},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str42, ei_iso8859_10},
+ #line 76 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_iso8859_3},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str43, ei_iso8859_3},
+ {-1},
+ #line 126 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str45, ei_iso8859_9},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str45, ei_iso8859_9},
+ #line 68 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str46, ei_iso8859_2},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str46, ei_iso8859_2},
+ {-1}, {-1},
+ #line 151 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str49, ei_iso8859_14},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str49, ei_iso8859_14},
+ {-1}, {-1}, {-1},
+ #line 318 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str53, ei_euc_cn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str53, ei_euc_cn},
+ {-1}, {-1}, {-1},
+ #line 62 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str57, ei_iso8859_1},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str57, ei_iso8859_1},
+ #line 139 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str58, ei_iso8859_11},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str58, ei_iso8859_11},
+ #line 102 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str59, ei_iso8859_6},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str59, ei_iso8859_6},
+ #line 166 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str60, ei_iso8859_16},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str60, ei_iso8859_16},
+ #line 78 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str61, ei_iso8859_3},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str61, ei_iso8859_3},
+ #line 145 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str62, ei_iso8859_13},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str62, ei_iso8859_13},
+ {-1}, {-1},
+ #line 93 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str65, ei_iso8859_5},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str65, ei_iso8859_5},
+ #line 159 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str66, ei_iso8859_15},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str66, ei_iso8859_15},
+ #line 70 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str67, ei_iso8859_2},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str67, ei_iso8859_2},
+ {-1}, {-1},
+ #line 317 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str70, ei_euc_cn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str70, ei_euc_cn},
+ {-1}, {-1},
+ #line 120 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str73, ei_iso8859_8},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str73, ei_iso8859_8},
+ #line 53 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str74, ei_iso8859_1},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str74, ei_iso8859_1},
+ #line 137 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str75, ei_iso8859_11},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str75, ei_iso8859_11},
+ #line 94 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str76, ei_iso8859_6},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str76, ei_iso8859_6},
+ #line 160 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str77, ei_iso8859_16},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str77, ei_iso8859_16},
+ #line 71 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str78, ei_iso8859_3},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str78, ei_iso8859_3},
+ #line 140 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str79, ei_iso8859_13},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str79, ei_iso8859_13},
+ {-1},
+ #line 128 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str81, ei_iso8859_9},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str81, ei_iso8859_9},
+ #line 87 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str82, ei_iso8859_5},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str82, ei_iso8859_5},
+ #line 154 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str83, ei_iso8859_15},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str83, ei_iso8859_15},
+ #line 63 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str84, ei_iso8859_2},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str84, ei_iso8859_2},
+ #line 286 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str85, ei_iso646_cn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str85, ei_iso646_cn},
+ #line 227 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str86, ei_hp_roman8},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str86, ei_hp_roman8},
+ {-1},
+ #line 84 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str88, ei_iso8859_4},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str88, ei_iso8859_4},
+ {-1},
+ #line 114 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str90, ei_iso8859_8},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str90, ei_iso8859_8},
+ #line 350 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str91, ei_cp949},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str91, ei_cp949},
+ #line 54 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str92, ei_iso8859_1},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str92, ei_iso8859_1},
+ #line 138 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str93, ei_iso8859_11},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str93, ei_iso8859_11},
+ #line 95 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str94, ei_iso8859_6},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str94, ei_iso8859_6},
+ #line 161 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str95, ei_iso8859_16},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str95, ei_iso8859_16},
+ #line 72 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str96, ei_iso8859_3},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str96, ei_iso8859_3},
+ #line 141 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str97, ei_iso8859_13},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str97, ei_iso8859_13},
+ #line 121 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str98, ei_iso8859_9},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str98, ei_iso8859_9},
+ #line 162 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str99, ei_iso8859_16},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str99, ei_iso8859_16},
+ #line 88 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str100, ei_iso8859_5},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str100, ei_iso8859_5},
+ #line 155 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str101, ei_iso8859_15},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str101, ei_iso8859_15},
+ #line 64 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str102, ei_iso8859_2},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str102, ei_iso8859_2},
+ #line 59 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str103, ei_iso8859_1},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str103, ei_iso8859_1},
+ {-1},
+ #line 133 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str105, ei_iso8859_10},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str105, ei_iso8859_10},
+ #line 236 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str106, ei_pt154},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str106, ei_pt154},
+ #line 75 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str107, ei_iso8859_3},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str107, ei_iso8859_3},
+ #line 115 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str108, ei_iso8859_8},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str108, ei_iso8859_8},
+ {-1},
+ #line 156 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str110, ei_iso8859_15},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str110, ei_iso8859_15},
+ #line 125 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str111, ei_iso8859_9},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str111, ei_iso8859_9},
+ #line 183 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str112, ei_cp1254},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str112, ei_cp1254},
+ #line 67 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str113, ei_iso8859_2},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str113, ei_iso8859_2},
+ #line 328 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str114, ei_iso2022_cn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str114, ei_iso2022_cn},
+ {-1},
+ #line 122 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str116, ei_iso8859_9},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str116, ei_iso8859_9},
+ #line 293 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str117, ei_gb2312},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str117, ei_gb2312},
+ #line 16 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str118, ei_ascii},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str118, ei_ascii},
+ #line 150 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str119, ei_iso8859_14},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str119, ei_iso8859_14},
+ #line 13 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str120, ei_ascii},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str120, ei_ascii},
+ #line 252 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str121, ei_tis620},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str121, ei_tis620},
+ #line 282 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str122, ei_jisx0212},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str122, ei_jisx0212},
+ {-1},
+ #line 255 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str124, ei_viscii},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str124, ei_viscii},
+ #line 107 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str125, ei_iso8859_7},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str125, ei_iso8859_7},
+ #line 22 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str126, ei_ascii},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str126, ei_ascii},
+ #line 294 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str127, ei_isoir165},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str127, ei_isoir165},
+ {-1},
+ #line 257 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str129, ei_viscii},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str129, ei_viscii},
+ #line 163 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str130, ei_iso8859_16},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str130, ei_iso8859_16},
+ #line 212 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str131, ei_mac_roman},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str131, ei_mac_roman},
+ {-1}, {-1}, {-1}, {-1},
+ #line 117 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str136, ei_iso8859_8},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str136, ei_iso8859_8},
+ #line 291 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str137, ei_gb2312},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str137, ei_gb2312},
+ {-1},
+ #line 206 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str139, ei_cp866},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str139, ei_cp866},
+ {-1}, {-1},
+ #line 327 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str142, ei_iso2022_cn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str142, ei_iso2022_cn},
+ #line 324 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str143, ei_cp936},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str143, ei_cp936},
+ #line 158 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str144, ei_iso8859_15},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str144, ei_iso8859_15},
+ {-1},
+ #line 283 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str146, ei_jisx0212},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str146, ei_jisx0212},
+ #line 202 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str147, ei_cp862},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str147, ei_cp862},
+ {-1}, {-1},
+ #line 21 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str150, ei_ascii},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str150, ei_ascii},
+ #line 86 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str151, ei_iso8859_4},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str151, ei_iso8859_4},
+ #line 153 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str152, ei_iso8859_14},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str152, ei_iso8859_14},
+ #line 148 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str153, ei_iso8859_14},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str153, ei_iso8859_14},
+ #line 149 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str154, ei_iso8859_14},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str154, ei_iso8859_14},
+ {-1},
+ #line 351 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str156, ei_cp949},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str156, ei_cp949},
+ #line 199 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str157, ei_cp850},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str157, ei_cp850},
+ {-1},
+ #line 330 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str159, ei_hz},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str159, ei_hz},
+ #line 58 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str160, ei_iso8859_1},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str160, ei_iso8859_1},
+ {-1},
+ #line 152 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str162, ei_iso8859_14},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str162, ei_iso8859_14},
+ #line 109 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str163, ei_iso8859_7},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str163, ei_iso8859_7},
+ #line 171 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str164, ei_cp1250},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str164, ei_cp1250},
+ #line 319 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str165, ei_euc_cn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str165, ei_euc_cn},
+ #line 197 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str166, ei_cp850},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str166, ei_cp850},
+ {-1},
+ #line 79 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str168, ei_iso8859_4},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str168, ei_iso8859_4},
+ #line 146 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str169, ei_iso8859_14},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str169, ei_iso8859_14},
+ #line 341 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str170, ei_cp950},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str170, ei_cp950},
+ #line 91 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str171, ei_iso8859_5},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str171, ei_iso8859_5},
+ {-1}, {-1}, {-1}, {-1},
+ #line 131 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str176, ei_iso8859_10},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str176, ei_iso8859_10},
+ {-1}, {-1},
+ #line 24 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str179, ei_ucs2},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str179, ei_ucs2},
+ #line 258 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str180, ei_tcvn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str180, ei_tcvn},
+ #line 124 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str181, ei_iso8859_9},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str181, ei_iso8859_9},
+ {-1}, {-1}, {-1},
+ #line 269 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str185, ei_jisx0201},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str185, ei_jisx0201},
+ #line 80 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str186, ei_iso8859_4},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str186, ei_iso8859_4},
+ #line 147 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str187, ei_iso8859_14},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str187, ei_iso8859_14},
+ #line 165 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str188, ei_iso8859_16},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str188, ei_iso8859_16},
+ #line 299 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str189, ei_ksc5601},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str189, ei_ksc5601},
+ {-1},
+ #line 66 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str191, ei_iso8859_2},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str191, ei_iso8859_2},
+ {-1}, {-1}, {-1}, {-1},
+ #line 329 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str196, ei_iso2022_cn_ext},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str196, ei_iso2022_cn_ext},
+ #line 83 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str197, ei_iso8859_4},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str197, ei_iso8859_4},
+ {-1}, {-1},
+ #line 157 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str200, ei_iso8859_15},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str200, ei_iso8859_15},
+ #line 275 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str201, ei_jisx0208},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str201, ei_jisx0208},
+ #line 296 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str202, ei_ksc5601},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str202, ei_ksc5601},
+ {-1},
+ #line 136 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str204, ei_iso8859_10},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str204, ei_iso8859_10},
+ {-1}, {-1},
+ #line 256 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str207, ei_viscii},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str207, ei_viscii},
+ {-1},
+ #line 144 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str209, ei_iso8859_13},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str209, ei_iso8859_13},
+ {-1},
+ #line 264 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str211, ei_iso646_jp},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str211, ei_iso646_jp},
+ #line 234 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str212, ei_pt154},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str212, ei_pt154},
+ #line 247 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str213, ei_tis620},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str213, ei_tis620},
+ {-1},
+ #line 74 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str215, ei_iso8859_3},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str215, ei_iso8859_3},
+ #line 30 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str216, ei_ucs2be},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str216, ei_ucs2be},
+ #line 233 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str217, ei_koi8_t},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str217, ei_koi8_t},
+ #line 239 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str218, ei_rk1048},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str218, ei_rk1048},
+ {-1}, {-1},
+ #line 129 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str221, ei_iso8859_10},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str221, ei_iso8859_10},
+ #line 251 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str222, ei_tis620},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str222, ei_tis620},
+ #line 14 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str223, ei_ascii},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str223, ei_ascii},
+ #line 61 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str224, ei_iso8859_1},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str224, ei_iso8859_1},
+ {-1},
+ #line 135 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str226, ei_iso8859_10},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str226, ei_iso8859_10},
+ {-1},
+ #line 77 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str228, ei_iso8859_3},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str228, ei_iso8859_3},
+ {-1},
+ #line 246 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str230, ei_tis620},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str230, ei_tis620},
+ {-1},
+ #line 127 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str232, ei_iso8859_9},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str232, ei_iso8859_9},
+ {-1},
+ #line 69 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str234, ei_iso8859_2},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str234, ei_iso8859_2},
+ #line 249 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str235, ei_tis620},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str235, ei_tis620},
+ #line 242 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str236, ei_rk1048},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str236, ei_rk1048},
+ #line 92 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str237, ei_iso8859_5},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str237, ei_iso8859_5},
+ #line 241 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str238, ei_rk1048},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str238, ei_rk1048},
+ #line 130 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str239, ei_iso8859_10},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str239, ei_iso8859_10},
+ {-1},
+ #line 29 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str241, ei_ucs2be},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str241, ei_ucs2be},
+ #line 38 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str242, ei_utf16},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str242, ei_utf16},
+ {-1}, {-1},
+ #line 173 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str245, ei_cp1250},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str245, ei_cp1250},
+ {-1}, {-1},
+ #line 26 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str248, ei_ucs2},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str248, ei_ucs2},
+ #line 168 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str249, ei_koi8_r},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str249, ei_koi8_r},
+ #line 164 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str250, ei_iso8859_16},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str250, ei_iso8859_16},
+ {-1},
+ #line 41 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str252, ei_utf32},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str252, ei_utf32},
+ {-1},
+ #line 35 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str254, ei_ucs4},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str254, ei_ucs4},
+ #line 23 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str255, ei_utf8},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str255, ei_utf8},
+ {-1}, {-1}, {-1},
+ #line 90 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str259, ei_iso8859_5},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str259, ei_iso8859_5},
+ {-1},
+ #line 167 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str261, ei_koi8_r},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str261, ei_koi8_r},
+ #line 179 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str262, ei_cp1252},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str262, ei_cp1252},
+ #line 33 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str263, ei_ucs4},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str263, ei_ucs4},
+ #line 82 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str264, ei_iso8859_4},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str264, ei_iso8859_4},
+ {-1},
+ #line 245 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str266, ei_cp1133},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str266, ei_cp1133},
+ #line 208 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str267, ei_cp866},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str267, ei_cp866},
+ {-1}, {-1},
+ #line 298 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str270, ei_ksc5601},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str270, ei_ksc5601},
+ #line 356 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str271, ei_local_char},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str271, ei_local_char},
+ {-1},
+ #line 348 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str273, ei_euc_kr},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str273, ei_euc_kr},
+ {-1}, {-1}, {-1},
+ #line 335 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str277, ei_ces_big5},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str277, ei_ces_big5},
+ #line 253 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str278, ei_cp874},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str278, ei_cp874},
+ #line 230 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str279, ei_armscii_8},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str279, ei_armscii_8},
+ {-1}, {-1},
+ #line 340 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str282, ei_ces_big5},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str282, ei_ces_big5},
+ #line 31 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str283, ei_ucs2le},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str283, ei_ucs2le},
+ {-1}, {-1},
+ #line 198 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str286, ei_cp850},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str286, ei_cp850},
+ #line 12 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str287, ei_ascii},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str287, ei_ascii},
+ {-1}, {-1},
+ #line 347 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str290, ei_euc_kr},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str290, ei_euc_kr},
+ {-1}, {-1},
+ #line 321 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str293, ei_euc_cn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str293, ei_euc_cn},
+ #line 336 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str294, ei_ces_big5},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str294, ei_ces_big5},
+ #line 250 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str295, ei_tis620},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str295, ei_tis620},
+ {-1}, {-1}, {-1},
+ #line 339 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str299, ei_ces_big5},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str299, ei_ces_big5},
+ {-1}, {-1},
+ #line 218 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str302, ei_mac_cyrillic},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str302, ei_mac_cyrillic},
+ #line 322 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str303, ei_ces_gbk},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str303, ei_ces_gbk},
+ #line 248 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str304, ei_tis620},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str304, ei_tis620},
+ #line 176 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str305, ei_cp1251},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str305, ei_cp1251},
+ {-1},
+ #line 237 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str307, ei_pt154},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str307, ei_pt154},
+ #line 108 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str308, ei_iso8859_7},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str308, ei_iso8859_7},
+ {-1},
+ #line 142 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str310, ei_iso8859_13},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str310, ei_iso8859_13},
+ #line 110 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str311, ei_iso8859_7},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str311, ei_iso8859_7},
+ {-1}, {-1}, {-1},
+ #line 301 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str315, ei_ksc5601},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str315, ei_ksc5601},
+ {-1}, {-1},
+ #line 85 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str318, ei_iso8859_4},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str318, ei_iso8859_4},
+ {-1}, {-1},
+ #line 25 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str321, ei_ucs2},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str321, ei_ucs2},
+ {-1}, {-1}, {-1},
+ #line 37 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str325, ei_ucs4le},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str325, ei_ucs4le},
+ #line 235 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str326, ei_pt154},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str326, ei_pt154},
+ {-1}, {-1}, {-1},
+ #line 266 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str330, ei_iso646_jp},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str330, ei_iso646_jp},
+ {-1}, {-1}, {-1},
+ #line 355 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str334, ei_iso2022_kr},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str334, ei_iso2022_kr},
+ {-1},
+ #line 226 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str336, ei_hp_roman8},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str336, ei_hp_roman8},
+ #line 56 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str337, ei_iso8859_1},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str337, ei_iso8859_1},
+ {-1}, {-1},
+ #line 277 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str340, ei_jisx0208},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str340, ei_jisx0208},
+ {-1}, {-1}, {-1},
+ #line 101 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str344, ei_iso8859_6},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str344, ei_iso8859_6},
+ {-1}, {-1},
+ #line 19 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str347, ei_ascii},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str347, ei_ascii},
+ {-1}, {-1},
+ #line 40 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str350, ei_utf16le},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str350, ei_utf16le},
+ #line 15 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str351, ei_ascii},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str351, ei_ascii},
+ {-1}, {-1},
+ #line 192 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str354, ei_cp1257},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str354, ei_cp1257},
+ #line 215 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str355, ei_mac_iceland},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str355, ei_mac_iceland},
+ #line 43 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str356, ei_utf32le},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str356, ei_utf32le},
+ #line 300 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str357, ei_ksc5601},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str357, ei_ksc5601},
+ {-1},
+ #line 100 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str359, ei_iso8859_6},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str359, ei_iso8859_6},
+ {-1}, {-1},
+ #line 354 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str362, ei_iso2022_kr},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str362, ei_iso2022_kr},
+ #line 34 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str363, ei_ucs4},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str363, ei_ucs4},
+ {-1}, {-1}, {-1},
+ #line 27 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str367, ei_ucs2be},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str367, ei_ucs2be},
+ #line 290 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str368, ei_gb2312},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str368, ei_gb2312},
+ #line 265 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str369, ei_iso646_jp},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str369, ei_iso646_jp},
+ {-1},
+ #line 243 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str371, ei_mulelao},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str371, ei_mulelao},
+ #line 284 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str372, ei_jisx0212},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str372, ei_jisx0212},
+ #line 111 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str373, ei_iso8859_7},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str373, ei_iso8859_7},
+ {-1},
+ #line 260 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str375, ei_tcvn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str375, ei_tcvn},
+ #line 292 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str376, ei_gb2312},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str376, ei_gb2312},
+ {-1},
+ #line 326 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str378, ei_gb18030},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str378, ei_gb18030},
+ #line 259 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str379, ei_tcvn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str379, ei_tcvn},
+ {-1}, {-1}, {-1}, {-1},
+ #line 285 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str384, ei_iso646_cn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str384, ei_iso646_cn},
+ #line 238 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str385, ei_pt154},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str385, ei_pt154},
+ #line 98 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str386, ei_iso8859_6},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str386, ei_iso8859_6},
+ {-1},
+ #line 46 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str388, ei_utf7},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str388, ei_utf7},
+ {-1}, {-1},
+ #line 18 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str391, ei_ascii},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str391, ei_ascii},
+ #line 32 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str392, ei_ucs2le},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str392, ei_ucs2le},
+ #line 113 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str393, ei_iso8859_7},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str393, ei_iso8859_7},
+ {-1},
+ #line 295 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str395, ei_isoir165},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str395, ei_isoir165},
+ #line 240 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str396, ei_rk1048},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str396, ei_rk1048},
+ {-1},
+ #line 17 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str398, ei_ascii},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str398, ei_ascii},
+ {-1}, {-1}, {-1}, {-1},
+ #line 169 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str403, ei_koi8_u},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str403, ei_koi8_u},
+ {-1}, {-1},
+ #line 47 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str406, ei_ucs2internal},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str406, ei_ucs2internal},
+ {-1}, {-1},
+ #line 36 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str409, ei_ucs4be},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str409, ei_ucs4be},
+ #line 103 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str410, ei_iso8859_7},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str410, ei_iso8859_7},
+ #line 307 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str411, ei_sjis},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str411, ei_sjis},
+ #line 320 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str412, ei_euc_cn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str412, ei_euc_cn},
+ #line 262 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str413, ei_iso646_jp},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str413, ei_iso646_jp},
+ {-1},
+ #line 45 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str415, ei_utf7},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str415, ei_utf7},
+ #line 175 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str416, ei_cp1251},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str416, ei_cp1251},
+ #line 190 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str417, ei_cp1256},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str417, ei_cp1256},
+ #line 181 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str418, ei_cp1253},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str418, ei_cp1253},
+ {-1},
+ #line 187 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str420, ei_cp1255},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str420, ei_cp1255},
+ #line 178 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str421, ei_cp1252},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str421, ei_cp1252},
+ #line 325 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str422, ei_cp936},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str422, ei_cp936},
+ {-1},
+ #line 196 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str424, ei_cp1258},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str424, ei_cp1258},
+ #line 349 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str425, ei_euc_kr},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str425, ei_euc_kr},
+ #line 297 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str426, ei_ksc5601},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str426, ei_ksc5601},
+ {-1},
+ #line 104 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str428, ei_iso8859_7},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str428, ei_iso8859_7},
+ #line 306 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str429, ei_sjis},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str429, ei_sjis},
+ {-1}, {-1}, {-1},
+ #line 274 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str433, ei_jisx0208},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str433, ei_jisx0208},
+ #line 39 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str434, ei_utf16be},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str434, ei_utf16be},
+ {-1}, {-1}, {-1}, {-1},
+ #line 143 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str439, ei_iso8859_13},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str439, ei_iso8859_13},
+ #line 42 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str440, ei_utf32be},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str440, ei_utf32be},
+ {-1}, {-1}, {-1}, {-1},
+ #line 224 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str445, ei_mac_thai},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str445, ei_mac_thai},
+ {-1}, {-1},
+ #line 49 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str448, ei_ucs4internal},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str448, ei_ucs4internal},
+ #line 112 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str449, ei_iso8859_7},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str449, ei_iso8859_7},
+ {-1},
+ #line 210 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str451, ei_mac_roman},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str451, ei_mac_roman},
+ #line 304 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str452, ei_euc_jp},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str452, ei_euc_jp},
+ {-1}, {-1}, {-1},
+ #line 333 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str456, ei_euc_tw},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str456, ei_euc_tw},
+ #line 287 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str457, ei_iso646_cn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str457, ei_iso646_cn},
+ #line 132 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str458, ei_iso8859_10},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str458, ei_iso8859_10},
+ #line 97 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str459, ei_iso8859_6},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str459, ei_iso8859_6},
+ {-1},
+ #line 276 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str461, ei_jisx0208},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str461, ei_jisx0208},
+ {-1},
+ #line 184 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str463, ei_cp1254},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str463, ei_cp1254},
+ #line 73 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str464, ei_iso8859_3},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str464, ei_iso8859_3},
+ {-1},
+ #line 89 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str466, ei_iso8859_5},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str466, ei_iso8859_5},
+ #line 20 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str467, ei_ascii},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str467, ei_ascii},
+ {-1}, {-1},
+ #line 116 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str470, ei_iso8859_8},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str470, ei_iso8859_8},
+ #line 331 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str471, ei_hz},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str471, ei_hz},
+ {-1},
+ #line 332 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str473, ei_euc_tw},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str473, ei_euc_tw},
+ #line 289 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str474, ei_iso646_cn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str474, ei_iso646_cn},
+ #line 229 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str475, ei_nextstep},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str475, ei_nextstep},
+ #line 316 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str476, ei_iso2022_jp2},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str476, ei_iso2022_jp2},
+ {-1},
+ #line 123 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str478, ei_iso8859_9},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str478, ei_iso8859_9},
+ {-1},
+ #line 170 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str480, ei_koi8_ru},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str480, ei_koi8_ru},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 211 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str487, ei_mac_roman},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str487, ei_mac_roman},
+ {-1},
+ #line 172 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str489, ei_cp1250},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str489, ei_cp1250},
+ {-1}, {-1},
+ #line 279 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str492, ei_jisx0212},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str492, ei_jisx0212},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 314 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str500, ei_iso2022_jp1},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str500, ei_iso2022_jp1},
+ #line 216 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str501, ei_mac_croatian},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str501, ei_mac_croatian},
+ #line 225 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str502, ei_hp_roman8},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str502, ei_hp_roman8},
+ {-1}, {-1},
+ #line 315 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str505, ei_iso2022_jp2},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str505, ei_iso2022_jp2},
+ {-1}, {-1}, {-1},
+ #line 81 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str509, ei_iso8859_4},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str509, ei_iso8859_4},
+ #line 345 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str510, ei_big5hkscs2004},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str510, ei_big5hkscs2004},
+ {-1}, {-1}, {-1}, {-1},
+ #line 99 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str515, ei_iso8859_6},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str515, ei_iso8859_6},
+ {-1}, {-1},
+ #line 303 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str518, ei_euc_jp},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str518, ei_euc_jp},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 338 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str525, ei_ces_big5},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str525, ei_ces_big5},
+ {-1},
+ #line 344 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str527, ei_big5hkscs2004},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str527, ei_big5hkscs2004},
+ {-1}, {-1}, {-1},
+ #line 214 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str531, ei_mac_centraleurope},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str531, ei_mac_centraleurope},
+ #line 204 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str532, ei_cp862},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str532, ei_cp862},
+ {-1}, {-1},
+ #line 302 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str535, ei_euc_jp},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str535, ei_euc_jp},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 337 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str542, ei_ces_big5},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str542, ei_ces_big5},
+ {-1}, {-1}, {-1},
+ #line 310 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str546, ei_sjis},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str546, ei_sjis},
+ {-1}, {-1}, {-1},
+ #line 263 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str550, ei_iso646_jp},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str550, ei_iso646_jp},
+ {-1}, {-1}, {-1},
+ #line 268 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str554, ei_jisx0201},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str554, ei_jisx0201},
+ #line 267 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str555, ei_jisx0201},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str555, ei_jisx0201},
+ #line 119 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str556, ei_iso8859_8},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str556, ei_iso8859_8},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 223 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str563, ei_mac_arabic},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str563, ei_mac_arabic},
+ #line 278 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str564, ei_jisx0208},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str564, ei_jisx0208},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 271 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str571, ei_jisx0208},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str571, ei_jisx0208},
+ {-1}, {-1}, {-1},
+ #line 44 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str575, ei_utf7},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str575, ei_utf7},
+ {-1},
+ #line 220 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str577, ei_mac_greek},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str577, ei_mac_greek},
+ {-1},
+ #line 313 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str579, ei_iso2022_jp},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str579, ei_iso2022_jp},
+ #line 185 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str580, ei_cp1254},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str580, ei_cp1254},
+ #line 281 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str581, ei_jisx0212},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str581, ei_jisx0212},
+ {-1}, {-1},
+ #line 193 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str584, ei_cp1257},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str584, ei_cp1257},
+ {-1},
+ #line 272 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str586, ei_jisx0208},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str586, ei_jisx0208},
+ {-1}, {-1}, {-1},
+ #line 182 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str590, ei_cp1253},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str590, ei_cp1253},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 228 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str599, ei_hp_roman8},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str599, ei_hp_roman8},
+ #line 52 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str600, ei_java},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str600, ei_java},
+ #line 188 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str601, ei_cp1255},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str601, ei_cp1255},
+ {-1}, {-1},
+ #line 213 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str604, ei_mac_roman},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str604, ei_mac_roman},
+ {-1}, {-1},
+ #line 312 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str607, ei_iso2022_jp},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str607, ei_iso2022_jp},
+ #line 334 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str608, ei_euc_tw},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str608, ei_euc_tw},
+ {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 232 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str614, ei_georgian_ps},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str614, ei_georgian_ps},
+ #line 28 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str615, ei_ucs2be},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str615, ei_ucs2be},
+ {-1},
+ #line 309 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str617, ei_sjis},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str617, ei_sjis},
+ {-1}, {-1},
+ #line 200 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str620, ei_cp850},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str620, ei_cp850},
+ #line 219 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str621, ei_mac_ukraine},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str621, ei_mac_ukraine},
+ #line 55 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str622, ei_iso8859_1},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str622, ei_iso8859_1},
+ #line 96 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str623, ei_iso8859_6},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str623, ei_iso8859_6},
+ #line 106 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str624, ei_iso8859_7},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str624, ei_iso8859_7},
+ {-1},
+ #line 231 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str626, ei_georgian_academy},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str626, ei_georgian_academy},
+ #line 65 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str627, ei_iso8859_2},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str627, ei_iso8859_2},
+ {-1},
+ #line 280 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str629, ei_jisx0212},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str629, ei_jisx0212},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 273 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str657, ei_jisx0208},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str657, ei_jisx0208},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 357 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str664, ei_local_wchar_t},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str664, ei_local_wchar_t},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 217 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str673, ei_mac_romania},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str673, ei_mac_romania},
+ {-1}, {-1},
+ #line 254 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str676, ei_cp874},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str676, ei_cp874},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1},
+ #line 305 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str689, ei_euc_jp},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str689, ei_euc_jp},
+ {-1},
+ #line 191 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str691, ei_cp1256},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str691, ei_cp1256},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1},
+ #line 48 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str723, ei_ucs2swapped},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str723, ei_ucs2swapped},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 261 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str739, ei_tcvn},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str739, ei_tcvn},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 118 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str746, ei_iso8859_8},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str746, ei_iso8859_8},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 50 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str765, ei_ucs4swapped},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str765, ei_ucs4swapped},
+ {-1}, {-1},
+ #line 352 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str768, ei_johab},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str768, ei_johab},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 221 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str786, ei_mac_turkish},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str786, ei_mac_turkish},
+ {-1}, {-1}, {-1},
+ #line 105 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str790, ei_iso8859_7},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str790, ei_iso8859_7},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+@@ -1661,28 +1661,28 @@
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 194 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str842, ei_cp1257},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str842, ei_cp1257},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 343 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str888, ei_big5hkscs2001},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str888, ei_big5hkscs2001},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 270 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str898, ei_jisx0201},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str898, ei_jisx0201},
+ {-1},
+ #line 342 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str900, ei_big5hkscs1999},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str900, ei_big5hkscs1999},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 222 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str908, ei_mac_hebrew},
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str908, ei_mac_hebrew},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+ #line 346 "lib/aliases.gperf"
+- {(int)(long)&((struct stringpool_t *)0)->stringpool_str935, ei_big5hkscs2004}
++ {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str935, ei_big5hkscs2004}
+ };
+
+ #ifdef __GNUC__
+diff -ruN libiconv/lib/iconv.c libiconv.new/lib/iconv.c
+--- libiconv/lib/iconv.c 2009-06-21 13:17:33.000000000 +0200
++++ libiconv.new/lib/iconv.c 2009-09-02 23:24:06.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <iconv.h>
+
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <string.h>
+ #include "config.h"
+ #include "localcharset.h"
+@@ -168,7 +169,7 @@
+ };
+ #define stringpool2 ((const char *) &stringpool2_contents)
+ static const struct alias sysdep_aliases[] = {
+-#define S(tag,name,encoding_index) { (int)(long)&((struct stringpool2_t *)0)->stringpool_##tag, encoding_index },
++#define S(tag,name,encoding_index) { (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_##tag, encoding_index },
+ #include "aliases2.h"
+ #undef S
+ };
+--- libiconv/srclib/malloca.c 2009-06-21 13:31:08.000000000 +0200
++++ libiconv.new/srclib/malloca.c 2009-09-03 00:02:20.000000000 +0200
+@@ -75,7 +75,7 @@
+
+ if (p != NULL)
+ {
+- size_t slot;
++ uintptr_t slot;
+
+ p += HEADER_SIZE;
+
+@@ -83,7 +83,7 @@
+ ((int *) p)[-1] = MAGIC_NUMBER;
+
+ /* Enter p into the hash table. */
+- slot = (unsigned long) p % HASH_TABLE_SIZE;
++ slot = (uintptr_t) p % HASH_TABLE_SIZE;
+ ((struct header *) (p - HEADER_SIZE))->next = mmalloca_results[slot];
+ mmalloca_results[slot] = p;
+
+@@ -116,7 +116,7 @@
+ {
+ /* Looks like a mmalloca() result. To see whether it really is one,
+ perform a lookup in the hash table. */
+- size_t slot = (unsigned long) p % HASH_TABLE_SIZE;
++ uintptr_t slot = (uintptr_t) p % HASH_TABLE_SIZE;
+ void **chain = &mmalloca_results[slot];
+ for (; *chain != NULL;)
+ {
projects / vlc / commitdiff