1--- iconv/lib/aliases.h.orig	2017-04-11 11:15:29.530518427 +0200
2+++ iconv/lib/aliases.h	2017-04-11 11:20:52.782454542 +0200
3@@ -815,890 +815,890 @@
4     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
5     {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
6 #line 134 "lib/aliases.gperf"
7-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_iso8859_10},
8+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str15, ei_iso8859_10},
9     {-1},
10 #line 60 "lib/aliases.gperf"
11-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, ei_iso8859_1},
12+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str17, ei_iso8859_1},
13     {-1}, {-1},
14 #line 288 "lib/aliases.gperf"
15-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, ei_iso646_cn},
16+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str20, ei_iso646_cn},
17     {-1}, {-1}, {-1}, {-1},
18 #line 84 "lib/aliases.gperf"
19-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, ei_iso8859_4},
20+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str25, ei_iso8859_4},
21     {-1},
22 #line 126 "lib/aliases.gperf"
23-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, ei_iso8859_9},
24+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str27, ei_iso8859_9},
25     {-1}, {-1},
26 #line 227 "lib/aliases.gperf"
27-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, ei_hp_roman8},
28+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str30, ei_hp_roman8},
29     {-1}, {-1},
30 #line 151 "lib/aliases.gperf"
31-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, ei_iso8859_14},
32+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str33, ei_iso8859_14},
33 #line 308 "lib/aliases.gperf"
34-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, ei_sjis},
35+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str34, ei_sjis},
36     {-1},
37 #line 207 "lib/aliases.gperf"
38-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, ei_cp866},
39+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str36, ei_cp866},
40     {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
41 #line 68 "lib/aliases.gperf"
42-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_iso8859_2},
43+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str43, ei_iso8859_2},
44     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
45 #line 16 "lib/aliases.gperf"
46-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str51, ei_ascii},
47+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str51, ei_ascii},
48     {-1}, {-1},
49 #line 205 "lib/aliases.gperf"
50-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str54, ei_cp866},
51+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str54, ei_cp866},
52     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
53 #line 51 "lib/aliases.gperf"
54-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str64, ei_c99},
55+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str64, ei_c99},
56 #line 252 "lib/aliases.gperf"
57-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str65, ei_tis620},
58+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str65, ei_tis620},
59 #line 320 "lib/aliases.gperf"
60-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str66, ei_euc_cn},
61+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str66, ei_euc_cn},
62 #line 133 "lib/aliases.gperf"
63-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str67, ei_iso8859_10},
64+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str67, ei_iso8859_10},
65     {-1}, {-1},
66 #line 236 "lib/aliases.gperf"
67-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str70, ei_pt154},
68+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str70, ei_pt154},
69 #line 59 "lib/aliases.gperf"
70-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str71, ei_iso8859_1},
71+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str71, ei_iso8859_1},
72 #line 319 "lib/aliases.gperf"
73-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str72, ei_euc_cn},
74+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str72, ei_euc_cn},
75     {-1},
76 #line 91 "lib/aliases.gperf"
77-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str74, ei_iso8859_5},
78+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str74, ei_iso8859_5},
79     {-1},
80 #line 286 "lib/aliases.gperf"
81-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str76, ei_iso646_cn},
82+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str76, ei_iso646_cn},
83     {-1},
84 #line 332 "lib/aliases.gperf"
85-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str78, ei_hz},
86+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str78, ei_hz},
87 #line 264 "lib/aliases.gperf"
88-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str79, ei_iso646_jp},
89+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str79, ei_iso646_jp},
90     {-1}, {-1}, {-1}, {-1},
91 #line 189 "lib/aliases.gperf"
92-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str84, ei_cp1256},
93+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str84, ei_cp1256},
94     {-1}, {-1},
95 #line 83 "lib/aliases.gperf"
96-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str87, ei_iso8859_4},
97+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str87, ei_iso8859_4},
98 #line 174 "lib/aliases.gperf"
99-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str88, ei_cp1251},
100+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str88, ei_cp1251},
101 #line 294 "lib/aliases.gperf"
102-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str89, ei_isoir165},
103+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str89, ei_isoir165},
104     {-1},
105 #line 125 "lib/aliases.gperf"
106-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str91, ei_iso8859_9},
107+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str91, ei_iso8859_9},
108 #line 203 "lib/aliases.gperf"
109-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str92, ei_cp862},
110+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str92, ei_cp862},
111 #line 107 "lib/aliases.gperf"
112-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str93, ei_iso8859_7},
113+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str93, ei_iso8859_7},
114     {-1},
115 #line 90 "lib/aliases.gperf"
116-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str95, ei_iso8859_5},
117+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str95, ei_iso8859_5},
118 #line 57 "lib/aliases.gperf"
119-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str96, ei_iso8859_1},
120+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str96, ei_iso8859_1},
121     {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
122 #line 150 "lib/aliases.gperf"
123-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str103, ei_iso8859_14},
124+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str103, ei_iso8859_14},
125 #line 183 "lib/aliases.gperf"
126-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str104, ei_cp1254},
127+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str104, ei_cp1254},
128 #line 291 "lib/aliases.gperf"
129-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str105, ei_gb2312},
130+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str105, ei_gb2312},
131 #line 353 "lib/aliases.gperf"
132-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str106, ei_cp949},
133+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str106, ei_cp949},
134     {-1},
135 #line 186 "lib/aliases.gperf"
136-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str108, ei_cp1255},
137+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str108, ei_cp1255},
138     {-1},
139 #line 201 "lib/aliases.gperf"
140-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str110, ei_cp862},
141+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str110, ei_cp862},
142 #line 124 "lib/aliases.gperf"
143-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str111, ei_iso8859_9},
144+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str111, ei_iso8859_9},
145 #line 76 "lib/aliases.gperf"
146-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str112, ei_iso8859_3},
147+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str112, ei_iso8859_3},
148 #line 158 "lib/aliases.gperf"
149-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str113, ei_iso8859_15},
150+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str113, ei_iso8859_15},
151 #line 293 "lib/aliases.gperf"
152-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str114, ei_gb2312},
153+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str114, ei_gb2312},
154 #line 299 "lib/aliases.gperf"
155-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str115, ei_ksc5601},
156+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str115, ei_ksc5601},
157     {-1},
158 #line 283 "lib/aliases.gperf"
159-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str117, ei_jisx0212},
160+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str117, ei_jisx0212},
161     {-1},
162 #line 163 "lib/aliases.gperf"
163-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str119, ei_iso8859_16},
164+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str119, ei_iso8859_16},
165 #line 195 "lib/aliases.gperf"
166-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str120, ei_cp1258},
167+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str120, ei_cp1258},
168 #line 234 "lib/aliases.gperf"
169-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str121, ei_pt154},
170+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str121, ei_pt154},
171     {-1},
172 #line 67 "lib/aliases.gperf"
173-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str123, ei_iso8859_2},
174+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str123, ei_iso8859_2},
175 #line 102 "lib/aliases.gperf"
176-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str124, ei_iso8859_6},
177+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str124, ei_iso8859_6},
178 #line 149 "lib/aliases.gperf"
179-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str125, ei_iso8859_14},
180+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str125, ei_iso8859_14},
181     {-1}, {-1},
182 #line 62 "lib/aliases.gperf"
183-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str128, ei_iso8859_1},
184+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str128, ei_iso8859_1},
185 #line 152 "lib/aliases.gperf"
186-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str129, ei_iso8859_14},
187+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str129, ei_iso8859_14},
188 #line 94 "lib/aliases.gperf"
189-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str130, ei_iso8859_6},
190+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str130, ei_iso8859_6},
191 #line 95 "lib/aliases.gperf"
192-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str131, ei_iso8859_6},
193+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str131, ei_iso8859_6},
194 #line 166 "lib/aliases.gperf"
195-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str132, ei_iso8859_16},
196+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str132, ei_iso8859_16},
197     {-1},
198 #line 53 "lib/aliases.gperf"
199-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str134, ei_iso8859_1},
200+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str134, ei_iso8859_1},
201 #line 54 "lib/aliases.gperf"
202-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str135, ei_iso8859_1},
203+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str135, ei_iso8859_1},
204 #line 139 "lib/aliases.gperf"
205-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str136, ei_iso8859_11},
206+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str136, ei_iso8859_11},
207     {-1},
208 #line 160 "lib/aliases.gperf"
209-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str138, ei_iso8859_16},
210+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str138, ei_iso8859_16},
211 #line 161 "lib/aliases.gperf"
212-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str139, ei_iso8859_16},
213+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str139, ei_iso8859_16},
214 #line 177 "lib/aliases.gperf"
215-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str140, ei_cp1252},
216+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str140, ei_cp1252},
217     {-1},
218 #line 137 "lib/aliases.gperf"
219-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str142, ei_iso8859_11},
220+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str142, ei_iso8859_11},
221 #line 138 "lib/aliases.gperf"
222-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str143, ei_iso8859_11},
223+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str143, ei_iso8859_11},
224 #line 86 "lib/aliases.gperf"
225-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str144, ei_iso8859_4},
226+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str144, ei_iso8859_4},
227 #line 356 "lib/aliases.gperf"
228-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str145, ei_johab},
229+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str145, ei_johab},
230 #line 162 "lib/aliases.gperf"
231-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str146, ei_iso8859_16},
232+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str146, ei_iso8859_16},
233 #line 209 "lib/aliases.gperf"
234-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str147, ei_cp1131},
235+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str147, ei_cp1131},
236 #line 93 "lib/aliases.gperf"
237-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str148, ei_iso8859_5},
238+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str148, ei_iso8859_5},
239     {-1},
240 #line 79 "lib/aliases.gperf"
241-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str150, ei_iso8859_4},
242+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str150, ei_iso8859_4},
243 #line 80 "lib/aliases.gperf"
244-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str151, ei_iso8859_4},
245+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str151, ei_iso8859_4},
246 #line 153 "lib/aliases.gperf"
247-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str152, ei_iso8859_14},
248+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str152, ei_iso8859_14},
249 #line 325 "lib/aliases.gperf"
250-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str153, ei_cp936},
251+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str153, ei_cp936},
252 #line 87 "lib/aliases.gperf"
253-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str154, ei_iso8859_5},
254+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str154, ei_iso8859_5},
255 #line 88 "lib/aliases.gperf"
256-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str155, ei_iso8859_5},
257+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str155, ei_iso8859_5},
258 #line 159 "lib/aliases.gperf"
259-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str156, ei_iso8859_15},
260+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str156, ei_iso8859_15},
261 #line 212 "lib/aliases.gperf"
262-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str157, ei_mac_roman},
263+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str157, ei_mac_roman},
264 #line 146 "lib/aliases.gperf"
265-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str158, ei_iso8859_14},
266+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str158, ei_iso8859_14},
267 #line 147 "lib/aliases.gperf"
268-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str159, ei_iso8859_14},
269+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str159, ei_iso8859_14},
270 #line 120 "lib/aliases.gperf"
271-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str160, ei_iso8859_8},
272+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str160, ei_iso8859_8},
273 #line 66 "lib/aliases.gperf"
274-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str161, ei_iso8859_2},
275+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str161, ei_iso8859_2},
276 #line 154 "lib/aliases.gperf"
277-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str162, ei_iso8859_15},
278+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str162, ei_iso8859_15},
279 #line 155 "lib/aliases.gperf"
280-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str163, ei_iso8859_15},
281+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str163, ei_iso8859_15},
282 #line 128 "lib/aliases.gperf"
283-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str164, ei_iso8859_9},
284+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str164, ei_iso8859_9},
285     {-1},
286 #line 114 "lib/aliases.gperf"
287-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str166, ei_iso8859_8},
288+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str166, ei_iso8859_8},
289 #line 115 "lib/aliases.gperf"
290-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str167, ei_iso8859_8},
291+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str167, ei_iso8859_8},
292     {-1}, {-1},
293 #line 121 "lib/aliases.gperf"
294-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str170, ei_iso8859_9},
295+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str170, ei_iso8859_9},
296 #line 122 "lib/aliases.gperf"
297-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str171, ei_iso8859_9},
298+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str171, ei_iso8859_9},
299 #line 148 "lib/aliases.gperf"
300-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str172, ei_iso8859_14},
301+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str172, ei_iso8859_14},
302     {-1},
303 #line 156 "lib/aliases.gperf"
304-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str174, ei_iso8859_15},
305+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str174, ei_iso8859_15},
306     {-1},
307 #line 239 "lib/aliases.gperf"
308-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str176, ei_rk1048},
309+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str176, ei_rk1048},
310     {-1}, {-1},
311 #line 109 "lib/aliases.gperf"
312-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str179, ei_iso8859_7},
313+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str179, ei_iso8859_7},
314 #line 70 "lib/aliases.gperf"
315-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str180, ei_iso8859_2},
316+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str180, ei_iso8859_2},
317     {-1},
318 #line 206 "lib/aliases.gperf"
319-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str182, ei_cp866},
320+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str182, ei_cp866},
321 #line 144 "lib/aliases.gperf"
322-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str183, ei_iso8859_13},
323+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str183, ei_iso8859_13},
324 #line 21 "lib/aliases.gperf"
325-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str184, ei_ascii},
326+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str184, ei_ascii},
327     {-1},
328 #line 63 "lib/aliases.gperf"
329-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str186, ei_iso8859_2},
330+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str186, ei_iso8859_2},
331 #line 64 "lib/aliases.gperf"
332-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str187, ei_iso8859_2},
333+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str187, ei_iso8859_2},
334     {-1}, {-1},
335 #line 282 "lib/aliases.gperf"
336-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str190, ei_jisx0212},
337+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str190, ei_jisx0212},
338     {-1}, {-1},
339 #line 359 "lib/aliases.gperf"
340-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str193, ei_local_char},
341+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str193, ei_local_char},
342     {-1}, {-1},
343 #line 235 "lib/aliases.gperf"
344-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str196, ei_pt154},
345+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str196, ei_pt154},
346 #line 74 "lib/aliases.gperf"
347-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str197, ei_iso8859_3},
348+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str197, ei_iso8859_3},
349 #line 117 "lib/aliases.gperf"
350-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str198, ei_iso8859_8},
351+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str198, ei_iso8859_8},
352 #line 354 "lib/aliases.gperf"
353-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str199, ei_cp949},
354+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str199, ei_cp949},
355     {-1}, {-1},
356 #line 13 "lib/aliases.gperf"
357-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str202, ei_ascii},
358+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str202, ei_ascii},
359     {-1},
360 #line 176 "lib/aliases.gperf"
361-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str204, ei_cp1251},
362+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str204, ei_cp1251},
363 #line 165 "lib/aliases.gperf"
364-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str205, ei_iso8859_16},
365+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str205, ei_iso8859_16},
366 #line 255 "lib/aliases.gperf"
367-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str206, ei_viscii},
368+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str206, ei_viscii},
369     {-1}, {-1},
370 #line 311 "lib/aliases.gperf"
371-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str209, ei_cp932},
372+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str209, ei_cp932},
373 #line 337 "lib/aliases.gperf"
374-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str210, ei_ces_big5},
375+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str210, ei_ces_big5},
376 #line 258 "lib/aliases.gperf"
377-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str211, ei_tcvn},
378+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str211, ei_tcvn},
379 #line 318 "lib/aliases.gperf"
380-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str212, ei_iso2022_jpms},
381+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str212, ei_iso2022_jpms},
382     {-1}, {-1}, {-1},
383 #line 338 "lib/aliases.gperf"
384-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str216, ei_ces_big5},
385+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str216, ei_ces_big5},
386 #line 173 "lib/aliases.gperf"
387-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str217, ei_cp1250},
388+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str217, ei_cp1250},
389     {-1}, {-1},
390 #line 199 "lib/aliases.gperf"
391-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str220, ei_cp850},
392+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str220, ei_cp850},
393     {-1},
394 #line 33 "lib/aliases.gperf"
395-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str222, ei_ucs4},
396+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str222, ei_ucs4},
397 #line 22 "lib/aliases.gperf"
398-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str223, ei_ascii},
399+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str223, ei_ascii},
400 #line 58 "lib/aliases.gperf"
401-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str224, ei_iso8859_1},
402+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str224, ei_iso8859_1},
403 #line 257 "lib/aliases.gperf"
404-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str225, ei_viscii},
405+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str225, ei_viscii},
406     {-1},
407 #line 321 "lib/aliases.gperf"
408-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str227, ei_euc_cn},
409+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str227, ei_euc_cn},
410 #line 269 "lib/aliases.gperf"
411-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str228, ei_jisx0201},
412+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str228, ei_jisx0201},
413 #line 342 "lib/aliases.gperf"
414-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str229, ei_ces_big5},
415+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str229, ei_ces_big5},
416     {-1}, {-1}, {-1}, {-1}, {-1},
417 #line 341 "lib/aliases.gperf"
418-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str235, ei_ces_big5},
419+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str235, ei_ces_big5},
420 #line 167 "lib/aliases.gperf"
421-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str236, ei_koi8_r},
422+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str236, ei_koi8_r},
423 #line 351 "lib/aliases.gperf"
424-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str237, ei_euc_kr},
425+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str237, ei_euc_kr},
426 #line 202 "lib/aliases.gperf"
427-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str238, ei_cp862},
428+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str238, ei_cp862},
429 #line 238 "lib/aliases.gperf"
430-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str239, ei_pt154},
431+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str239, ei_pt154},
432 #line 35 "lib/aliases.gperf"
433-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str240, ei_ucs4},
434+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str240, ei_ucs4},
435 #line 14 "lib/aliases.gperf"
436-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str241, ei_ascii},
437+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str241, ei_ascii},
438 #line 253 "lib/aliases.gperf"
439-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str242, ei_cp874},
440+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str242, ei_cp874},
441 #line 350 "lib/aliases.gperf"
442-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str243, ei_euc_kr},
443+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str243, ei_euc_kr},
444 #line 256 "lib/aliases.gperf"
445-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str244, ei_viscii},
446+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str244, ei_viscii},
447     {-1},
448 #line 15 "lib/aliases.gperf"
449-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str246, ei_ascii},
450+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str246, ei_ascii},
451     {-1},
452 #line 218 "lib/aliases.gperf"
453-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str248, ei_mac_cyrillic},
454+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str248, ei_mac_cyrillic},
455 #line 168 "lib/aliases.gperf"
456-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str249, ei_koi8_r},
457+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str249, ei_koi8_r},
458 #line 197 "lib/aliases.gperf"
459-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str250, ei_cp850},
460+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str250, ei_cp850},
461 #line 82 "lib/aliases.gperf"
462-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str251, ei_iso8859_4},
463+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str251, ei_iso8859_4},
464 #line 343 "lib/aliases.gperf"
465-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str252, ei_cp950},
466+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str252, ei_cp950},
467     {-1},
468 #line 329 "lib/aliases.gperf"
469-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str254, ei_iso2022_cn},
470+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str254, ei_iso2022_cn},
471 #line 295 "lib/aliases.gperf"
472-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str255, ei_isoir165},
473+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str255, ei_isoir165},
474     {-1},
475 #line 237 "lib/aliases.gperf"
476-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str257, ei_pt154},
477+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str257, ei_pt154},
478 #line 24 "lib/aliases.gperf"
479-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str258, ei_ucs2},
480+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str258, ei_ucs2},
481 #line 164 "lib/aliases.gperf"
482-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str259, ei_iso8859_16},
483+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str259, ei_iso8859_16},
484 #line 275 "lib/aliases.gperf"
485-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str260, ei_jisx0208},
486+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str260, ei_jisx0208},
487 #line 75 "lib/aliases.gperf"
488-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str261, ei_iso8859_3},
489+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str261, ei_iso8859_3},
490     {-1},
491 #line 330 "lib/aliases.gperf"
492-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str263, ei_iso2022_cn},
493+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str263, ei_iso2022_cn},
494 #line 131 "lib/aliases.gperf"
495-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str264, ei_iso8859_10},
496+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str264, ei_iso8859_10},
497     {-1}, {-1},
498 #line 37 "lib/aliases.gperf"
499-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str267, ei_ucs4le},
500+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str267, ei_ucs4le},
501 #line 171 "lib/aliases.gperf"
502-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str268, ei_cp1250},
503+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str268, ei_cp1250},
504     {-1}, {-1},
505 #line 135 "lib/aliases.gperf"
506-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str271, ei_iso8859_10},
507+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str271, ei_iso8859_10},
508     {-1},
509 #line 142 "lib/aliases.gperf"
510-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str273, ei_iso8859_13},
511+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str273, ei_iso8859_13},
512 #line 326 "lib/aliases.gperf"
513-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str274, ei_cp936},
514+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str274, ei_cp936},
515 #line 61 "lib/aliases.gperf"
516-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str275, ei_iso8859_1},
517+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str275, ei_iso8859_1},
518 #line 247 "lib/aliases.gperf"
519-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str276, ei_tis620},
520+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str276, ei_tis620},
521     {-1},
522 #line 180 "lib/aliases.gperf"
523-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str278, ei_cp1253},
524+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str278, ei_cp1253},
525     {-1}, {-1},
526 #line 331 "lib/aliases.gperf"
527-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str281, ei_iso2022_cn_ext},
528+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str281, ei_iso2022_cn_ext},
529 #line 246 "lib/aliases.gperf"
530-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str282, ei_tis620},
531+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str282, ei_tis620},
532     {-1}, {-1},
533 #line 31 "lib/aliases.gperf"
534-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str285, ei_ucs2le},
535+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str285, ei_ucs2le},
536 #line 233 "lib/aliases.gperf"
537-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str286, ei_koi8_t},
538+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str286, ei_koi8_t},
539     {-1}, {-1}, {-1},
540 #line 92 "lib/aliases.gperf"
541-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str290, ei_iso8859_5},
542+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str290, ei_iso8859_5},
543 #line 85 "lib/aliases.gperf"
544-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str291, ei_iso8859_4},
545+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str291, ei_iso8859_4},
546     {-1}, {-1}, {-1},
547 #line 127 "lib/aliases.gperf"
548-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str295, ei_iso8859_9},
549+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str295, ei_iso8859_9},
550 #line 29 "lib/aliases.gperf"
551-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str296, ei_ucs2be},
552+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str296, ei_ucs2be},
553     {-1}, {-1}, {-1}, {-1},
554 #line 110 "lib/aliases.gperf"
555-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str301, ei_iso8859_7},
556+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str301, ei_iso8859_7},
557 #line 49 "lib/aliases.gperf"
558-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str302, ei_ucs4internal},
559+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str302, ei_ucs4internal},
560     {-1},
561 #line 30 "lib/aliases.gperf"
562-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str304, ei_ucs2be},
563+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str304, ei_ucs2be},
564     {-1},
565 #line 26 "lib/aliases.gperf"
566-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str306, ei_ucs2},
567+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str306, ei_ucs2},
568 #line 249 "lib/aliases.gperf"
569-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str307, ei_tis620},
570+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str307, ei_tis620},
571     {-1}, {-1}, {-1},
572 #line 229 "lib/aliases.gperf"
573-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str311, ei_nextstep},
574+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str311, ei_nextstep},
575 #line 232 "lib/aliases.gperf"
576-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str312, ei_georgian_ps},
577+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str312, ei_georgian_ps},
578     {-1}, {-1}, {-1},
579 #line 136 "lib/aliases.gperf"
580-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str316, ei_iso8859_10},
581+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str316, ei_iso8859_10},
582     {-1},
583 #line 78 "lib/aliases.gperf"
584-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str318, ei_iso8859_3},
585+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str318, ei_iso8859_3},
586     {-1},
587 #line 47 "lib/aliases.gperf"
588-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str320, ei_ucs2internal},
589+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str320, ei_ucs2internal},
590     {-1},
591 #line 129 "lib/aliases.gperf"
592-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str322, ei_iso8859_10},
593+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str322, ei_iso8859_10},
594 #line 130 "lib/aliases.gperf"
595-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str323, ei_iso8859_10},
596+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str323, ei_iso8859_10},
597 #line 71 "lib/aliases.gperf"
598-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str324, ei_iso8859_3},
599+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str324, ei_iso8859_3},
600 #line 72 "lib/aliases.gperf"
601-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str325, ei_iso8859_3},
602+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str325, ei_iso8859_3},
603 #line 145 "lib/aliases.gperf"
604-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str326, ei_iso8859_13},
605+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str326, ei_iso8859_13},
606 #line 69 "lib/aliases.gperf"
607-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str327, ei_iso8859_2},
608+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str327, ei_iso8859_2},
609     {-1},
610 #line 285 "lib/aliases.gperf"
611-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str329, ei_iso646_cn},
612+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str329, ei_iso646_cn},
613     {-1}, {-1},
614 #line 140 "lib/aliases.gperf"
615-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str332, ei_iso8859_13},
616+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str332, ei_iso8859_13},
617 #line 141 "lib/aliases.gperf"
618-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str333, ei_iso8859_13},
619+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str333, ei_iso8859_13},
620     {-1}, {-1}, {-1},
621 #line 244 "lib/aliases.gperf"
622-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str337, ei_cp1133},
623+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str337, ei_cp1133},
624     {-1},
625 #line 179 "lib/aliases.gperf"
626-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str339, ei_cp1252},
627+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str339, ei_cp1252},
628     {-1},
629 #line 56 "lib/aliases.gperf"
630-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str341, ei_iso8859_1},
631+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str341, ei_iso8859_1},
632     {-1}, {-1},
633 #line 296 "lib/aliases.gperf"
634-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str344, ei_ksc5601},
635+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str344, ei_ksc5601},
636     {-1}, {-1}, {-1}, {-1},
637 #line 211 "lib/aliases.gperf"
638-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str349, ei_mac_roman},
639+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str349, ei_mac_roman},
640     {-1}, {-1},
641 #line 322 "lib/aliases.gperf"
642-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str352, ei_euc_cn},
643+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str352, ei_euc_cn},
644     {-1},
645 #line 208 "lib/aliases.gperf"
646-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str354, ei_cp866},
647+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str354, ei_cp866},
648 #line 34 "lib/aliases.gperf"
649-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str355, ei_ucs4},
650+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str355, ei_ucs4},
651     {-1},
652 #line 81 "lib/aliases.gperf"
653-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str357, ei_iso8859_4},
654+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str357, ei_iso8859_4},
655     {-1},
656 #line 89 "lib/aliases.gperf"
657-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str359, ei_iso8859_5},
658+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str359, ei_iso8859_5},
659     {-1},
660 #line 38 "lib/aliases.gperf"
661-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str361, ei_utf16},
662+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str361, ei_utf16},
663     {-1},
664 #line 241 "lib/aliases.gperf"
665-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str363, ei_rk1048},
666+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str363, ei_rk1048},
667 #line 226 "lib/aliases.gperf"
668-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str364, ei_hp_roman8},
669+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str364, ei_hp_roman8},
670 #line 116 "lib/aliases.gperf"
671-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str365, ei_iso8859_8},
672+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str365, ei_iso8859_8},
673 #line 32 "lib/aliases.gperf"
674-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str366, ei_ucs2le},
675+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str366, ei_ucs2le},
676     {-1}, {-1},
677 #line 123 "lib/aliases.gperf"
678-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str369, ei_iso8859_9},
679+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str369, ei_iso8859_9},
680     {-1}, {-1},
681 #line 265 "lib/aliases.gperf"
682-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str372, ei_iso646_jp},
683+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str372, ei_iso646_jp},
684 #line 25 "lib/aliases.gperf"
685-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str373, ei_ucs2},
686+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str373, ei_ucs2},
687     {-1},
688 #line 243 "lib/aliases.gperf"
689-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str375, ei_mulelao},
690+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str375, ei_mulelao},
691 #line 242 "lib/aliases.gperf"
692-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str376, ei_rk1048},
693+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str376, ei_rk1048},
694 #line 157 "lib/aliases.gperf"
695-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str377, ei_iso8859_15},
696+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str377, ei_iso8859_15},
697 #line 198 "lib/aliases.gperf"
698-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str378, ei_cp850},
699+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str378, ei_cp850},
700     {-1},
701 #line 248 "lib/aliases.gperf"
702-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str380, ei_tis620},
703+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str380, ei_tis620},
704     {-1},
705 #line 98 "lib/aliases.gperf"
706-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str382, ei_iso8859_6},
707+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str382, ei_iso8859_6},
708     {-1}, {-1}, {-1},
709 #line 298 "lib/aliases.gperf"
710-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str386, ei_ksc5601},
711+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str386, ei_ksc5601},
712     {-1},
713 #line 324 "lib/aliases.gperf"
714-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str388, ei_ces_gbk},
715+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str388, ei_ces_gbk},
716 #line 23 "lib/aliases.gperf"
717-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str389, ei_utf8},
718+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str389, ei_utf8},
719     {-1},
720 #line 230 "lib/aliases.gperf"
721-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str391, ei_armscii_8},
722+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str391, ei_armscii_8},
723 #line 12 "lib/aliases.gperf"
724-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str392, ei_ascii},
725+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str392, ei_ascii},
726     {-1}, {-1}, {-1}, {-1}, {-1},
727 #line 108 "lib/aliases.gperf"
728-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str398, ei_iso8859_7},
729+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str398, ei_iso8859_7},
730 #line 323 "lib/aliases.gperf"
731-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str399, ei_euc_cn},
732+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str399, ei_euc_cn},
733     {-1}, {-1}, {-1},
734 #line 143 "lib/aliases.gperf"
735-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str403, ei_iso8859_13},
736+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str403, ei_iso8859_13},
737 #line 301 "lib/aliases.gperf"
738-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str404, ei_ksc5601},
739+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str404, ei_ksc5601},
740 #line 287 "lib/aliases.gperf"
741-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str405, ei_iso646_cn},
742+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str405, ei_iso646_cn},
743     {-1}, {-1},
744 #line 188 "lib/aliases.gperf"
745-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str408, ei_cp1255},
746+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str408, ei_cp1255},
747 #line 266 "lib/aliases.gperf"
748-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str409, ei_iso646_jp},
749+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str409, ei_iso646_jp},
750     {-1},
751 #line 276 "lib/aliases.gperf"
752-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str411, ei_jisx0208},
753+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str411, ei_jisx0208},
754     {-1},
755 #line 132 "lib/aliases.gperf"
756-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str413, ei_iso8859_10},
757+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str413, ei_iso8859_10},
758     {-1}, {-1},
759 #line 40 "lib/aliases.gperf"
760-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str416, ei_utf16le},
761+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str416, ei_utf16le},
762     {-1},
763 #line 36 "lib/aliases.gperf"
764-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str418, ei_ucs4be},
765+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str418, ei_ucs4be},
766     {-1},
767 #line 192 "lib/aliases.gperf"
768-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str420, ei_cp1257},
769+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str420, ei_cp1257},
770 #line 18 "lib/aliases.gperf"
771-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str421, ei_ascii},
772+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str421, ei_ascii},
773     {-1}, {-1},
774 #line 352 "lib/aliases.gperf"
775-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str424, ei_euc_kr},
776+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str424, ei_euc_kr},
777 #line 357 "lib/aliases.gperf"
778-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str425, ei_iso2022_kr},
779+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str425, ei_iso2022_kr},
780 #line 290 "lib/aliases.gperf"
781-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str426, ei_gb2312},
782+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str426, ei_gb2312},
783     {-1}, {-1},
784 #line 97 "lib/aliases.gperf"
785-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str429, ei_iso8859_6},
786+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str429, ei_iso8859_6},
787 #line 224 "lib/aliases.gperf"
788-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str430, ei_mac_thai},
789+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str430, ei_mac_thai},
790 #line 335 "lib/aliases.gperf"
791-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str431, ei_euc_tw},
792+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str431, ei_euc_tw},
793     {-1},
794 #line 304 "lib/aliases.gperf"
795-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str433, ei_euc_jp},
796+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str433, ei_euc_jp},
797 #line 358 "lib/aliases.gperf"
798-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str434, ei_iso2022_kr},
799+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str434, ei_iso2022_kr},
800     {-1},
801 #line 27 "lib/aliases.gperf"
802-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str436, ei_ucs2be},
803+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str436, ei_ucs2be},
804 #line 334 "lib/aliases.gperf"
805-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str437, ei_euc_tw},
806+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str437, ei_euc_tw},
807     {-1},
808 #line 17 "lib/aliases.gperf"
809-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str439, ei_ascii},
810+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str439, ei_ascii},
811 #line 111 "lib/aliases.gperf"
812-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str440, ei_iso8859_7},
813+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str440, ei_iso8859_7},
814     {-1},
815 #line 215 "lib/aliases.gperf"
816-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str442, ei_mac_iceland},
817+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str442, ei_mac_iceland},
818 #line 328 "lib/aliases.gperf"
819-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str443, ei_gb18030},
820+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str443, ei_gb18030},
821 #line 73 "lib/aliases.gperf"
822-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str444, ei_iso8859_3},
823+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str444, ei_iso8859_3},
824 #line 101 "lib/aliases.gperf"
825-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str445, ei_iso8859_6},
826+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str445, ei_iso8859_6},
827 #line 231 "lib/aliases.gperf"
828-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str446, ei_georgian_academy},
829+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str446, ei_georgian_academy},
830     {-1},
831 #line 225 "lib/aliases.gperf"
832-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str448, ei_hp_roman8},
833+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str448, ei_hp_roman8},
834     {-1}, {-1}, {-1}, {-1},
835 #line 251 "lib/aliases.gperf"
836-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str453, ei_tis620},
837+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str453, ei_tis620},
838     {-1},
839 #line 28 "lib/aliases.gperf"
840-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str455, ei_ucs2be},
841+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str455, ei_ucs2be},
842     {-1}, {-1}, {-1},
843 #line 260 "lib/aliases.gperf"
844-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str459, ei_tcvn},
845+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str459, ei_tcvn},
846 #line 113 "lib/aliases.gperf"
847-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str460, ei_iso8859_7},
848+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str460, ei_iso8859_7},
849 #line 289 "lib/aliases.gperf"
850-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str461, ei_iso646_cn},
851+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str461, ei_iso646_cn},
852     {-1},
853 #line 214 "lib/aliases.gperf"
854-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str463, ei_mac_centraleurope},
855+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str463, ei_mac_centraleurope},
856 #line 112 "lib/aliases.gperf"
857-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str464, ei_iso8859_7},
858+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str464, ei_iso8859_7},
859 #line 77 "lib/aliases.gperf"
860-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str465, ei_iso8859_3},
861+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str465, ei_iso8859_3},
862 #line 103 "lib/aliases.gperf"
863-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str466, ei_iso8859_7},
864+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str466, ei_iso8859_7},
865 #line 104 "lib/aliases.gperf"
866-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str467, ei_iso8859_7},
867+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str467, ei_iso8859_7},
868 #line 45 "lib/aliases.gperf"
869-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str468, ei_utf7},
870+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str468, ei_utf7},
871 #line 19 "lib/aliases.gperf"
872-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str469, ei_ascii},
873+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str469, ei_ascii},
874 #line 333 "lib/aliases.gperf"
875-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str470, ei_hz},
876+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str470, ei_hz},
877     {-1}, {-1},
878 #line 303 "lib/aliases.gperf"
879-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str473, ei_euc_jp},
880+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str473, ei_euc_jp},
881 #line 46 "lib/aliases.gperf"
882-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str474, ei_utf7},
883+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str474, ei_utf7},
884     {-1},
885 #line 210 "lib/aliases.gperf"
886-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str476, ei_mac_roman},
887+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str476, ei_mac_roman},
888 #line 259 "lib/aliases.gperf"
889-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str477, ei_tcvn},
890+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str477, ei_tcvn},
891     {-1},
892 #line 302 "lib/aliases.gperf"
893-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str479, ei_euc_jp},
894+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str479, ei_euc_jp},
895     {-1}, {-1}, {-1},
896 #line 263 "lib/aliases.gperf"
897-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str483, ei_iso646_jp},
898+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str483, ei_iso646_jp},
899     {-1}, {-1}, {-1}, {-1}, {-1},
900 #line 348 "lib/aliases.gperf"
901-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str489, ei_big5hkscs2008},
902+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str489, ei_big5hkscs2008},
903 #line 292 "lib/aliases.gperf"
904-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str490, ei_gb2312},
905+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str490, ei_gb2312},
906     {-1},
907 #line 190 "lib/aliases.gperf"
908-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str492, ei_cp1256},
909+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str492, ei_cp1256},
910     {-1},
911 #line 175 "lib/aliases.gperf"
912-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str494, ei_cp1251},
913+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str494, ei_cp1251},
914 #line 347 "lib/aliases.gperf"
915-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str495, ei_big5hkscs2008},
916+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str495, ei_big5hkscs2008},
917 #line 360 "lib/aliases.gperf"
918-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str496, ei_local_wchar_t},
919+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str496, ei_local_wchar_t},
920 #line 96 "lib/aliases.gperf"
921-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str497, ei_iso8859_6},
922+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str497, ei_iso8859_6},
923     {-1},
924 #line 55 "lib/aliases.gperf"
925-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str499, ei_iso8859_1},
926+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str499, ei_iso8859_1},
927     {-1}, {-1},
928 #line 184 "lib/aliases.gperf"
929-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str502, ei_cp1254},
930+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str502, ei_cp1254},
931     {-1},
932 #line 187 "lib/aliases.gperf"
933-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str504, ei_cp1255},
934+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str504, ei_cp1255},
935     {-1}, {-1}, {-1}, {-1}, {-1},
936 #line 196 "lib/aliases.gperf"
937-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str510, ei_cp1258},
938+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str510, ei_cp1258},
939     {-1},
940 #line 41 "lib/aliases.gperf"
941-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str512, ei_utf32},
942+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str512, ei_utf32},
943     {-1}, {-1}, {-1},
944 #line 119 "lib/aliases.gperf"
945-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str516, ei_iso8859_8},
946+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str516, ei_iso8859_8},
947 #line 228 "lib/aliases.gperf"
948-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str517, ei_hp_roman8},
949+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str517, ei_hp_roman8},
950     {-1},
951 #line 284 "lib/aliases.gperf"
952-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str519, ei_jisx0212},
953+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str519, ei_jisx0212},
954 #line 178 "lib/aliases.gperf"
955-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str520, ei_cp1252},
956+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str520, ei_cp1252},
957     {-1},
958 #line 240 "lib/aliases.gperf"
959-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str522, ei_rk1048},
960+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str522, ei_rk1048},
961     {-1}, {-1},
962 #line 65 "lib/aliases.gperf"
963-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str525, ei_iso8859_2},
964+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str525, ei_iso8859_2},
965     {-1}, {-1}, {-1},
966 #line 100 "lib/aliases.gperf"
967-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str529, ei_iso8859_6},
968+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str529, ei_iso8859_6},
969 #line 213 "lib/aliases.gperf"
970-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str530, ei_mac_roman},
971+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str530, ei_mac_roman},
972     {-1}, {-1}, {-1},
973 #line 297 "lib/aliases.gperf"
974-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str534, ei_ksc5601},
975+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str534, ei_ksc5601},
976     {-1},
977 #line 262 "lib/aliases.gperf"
978-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str536, ei_iso646_jp},
979+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str536, ei_iso646_jp},
980 #line 277 "lib/aliases.gperf"
981-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str537, ei_jisx0208},
982+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str537, ei_jisx0208},
983     {-1},
984 #line 43 "lib/aliases.gperf"
985-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str539, ei_utf32le},
986+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str539, ei_utf32le},
987     {-1}, {-1}, {-1},
988 #line 250 "lib/aliases.gperf"
989-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str543, ei_tis620},
990+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str543, ei_tis620},
991     {-1}, {-1},
992 #line 245 "lib/aliases.gperf"
993-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str546, ei_cp1133},
994+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str546, ei_cp1133},
995 #line 307 "lib/aliases.gperf"
996-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str547, ei_sjis},
997+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str547, ei_sjis},
998 #line 306 "lib/aliases.gperf"
999-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str548, ei_sjis},
1000+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str548, ei_sjis},
1001     {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1002 #line 204 "lib/aliases.gperf"
1003-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str555, ei_cp862},
1004+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str555, ei_cp862},
1005     {-1},
1006 #line 340 "lib/aliases.gperf"
1007-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str557, ei_ces_big5},
1008+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str557, ei_ces_big5},
1009     {-1}, {-1},
1010 #line 300 "lib/aliases.gperf"
1011-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str560, ei_ksc5601},
1012+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str560, ei_ksc5601},
1013     {-1},
1014 #line 216 "lib/aliases.gperf"
1015-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str562, ei_mac_croatian},
1016+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str562, ei_mac_croatian},
1017 #line 339 "lib/aliases.gperf"
1018-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str563, ei_ces_big5},
1019+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str563, ei_ces_big5},
1020     {-1}, {-1},
1021 #line 327 "lib/aliases.gperf"
1022-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str566, ei_cp936},
1023+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str566, ei_cp936},
1024 #line 39 "lib/aliases.gperf"
1025-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str567, ei_utf16be},
1026+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str567, ei_utf16be},
1027     {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1028 #line 169 "lib/aliases.gperf"
1029-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str574, ei_koi8_u},
1030+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str574, ei_koi8_u},
1031     {-1}, {-1}, {-1}, {-1}, {-1},
1032 #line 170 "lib/aliases.gperf"
1033-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str580, ei_koi8_ru},
1034+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str580, ei_koi8_ru},
1035     {-1}, {-1}, {-1},
1036 #line 172 "lib/aliases.gperf"
1037-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str584, ei_cp1250},
1038+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str584, ei_cp1250},
1039 #line 182 "lib/aliases.gperf"
1040-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str585, ei_cp1253},
1041+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str585, ei_cp1253},
1042     {-1}, {-1}, {-1},
1043 #line 181 "lib/aliases.gperf"
1044-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str589, ei_cp1253},
1045+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str589, ei_cp1253},
1046     {-1},
1047 #line 220 "lib/aliases.gperf"
1048-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str591, ei_mac_greek},
1049+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str591, ei_mac_greek},
1050 #line 200 "lib/aliases.gperf"
1051-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str592, ei_cp850},
1052+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str592, ei_cp850},
1053     {-1},
1054 #line 106 "lib/aliases.gperf"
1055-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str594, ei_iso8859_7},
1056+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str594, ei_iso8859_7},
1057     {-1},
1058 #line 274 "lib/aliases.gperf"
1059-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str596, ei_jisx0208},
1060+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str596, ei_jisx0208},
1061 #line 20 "lib/aliases.gperf"
1062-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str597, ei_ascii},
1063+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str597, ei_ascii},
1064     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1065     {-1},
1066 #line 314 "lib/aliases.gperf"
1067-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str608, ei_iso2022_jp1},
1068+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str608, ei_iso2022_jp1},
1069     {-1},
1070 #line 317 "lib/aliases.gperf"
1071-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str610, ei_iso2022_jpms},
1072+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str610, ei_iso2022_jpms},
1073     {-1}, {-1},
1074 #line 279 "lib/aliases.gperf"
1075-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str613, ei_jisx0212},
1076+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str613, ei_jisx0212},
1077     {-1}, {-1}, {-1}, {-1},
1078 #line 336 "lib/aliases.gperf"
1079-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str618, ei_euc_tw},
1080+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str618, ei_euc_tw},
1081     {-1}, {-1}, {-1}, {-1}, {-1},
1082 #line 310 "lib/aliases.gperf"
1083-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str624, ei_sjis},
1084+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str624, ei_sjis},
1085 #line 118 "lib/aliases.gperf"
1086-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str625, ei_iso8859_8},
1087+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str625, ei_iso8859_8},
1088     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1089 #line 315 "lib/aliases.gperf"
1090-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str634, ei_iso2022_jp2},
1091+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str634, ei_iso2022_jp2},
1092 #line 99 "lib/aliases.gperf"
1093-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str635, ei_iso8859_6},
1094+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str635, ei_iso8859_6},
1095     {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1096 #line 316 "lib/aliases.gperf"
1097-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str642, ei_iso2022_jp2},
1098+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str642, ei_iso2022_jp2},
1099     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1100 #line 267 "lib/aliases.gperf"
1101-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str651, ei_jisx0201},
1102+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str651, ei_jisx0201},
1103     {-1}, {-1}, {-1},
1104 #line 254 "lib/aliases.gperf"
1105-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str655, ei_cp874},
1106+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str655, ei_cp874},
1107     {-1}, {-1}, {-1}, {-1},
1108 #line 193 "lib/aliases.gperf"
1109-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str660, ei_cp1257},
1110+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str660, ei_cp1257},
1111 #line 312 "lib/aliases.gperf"
1112-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str661, ei_iso2022_jp},
1113+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str661, ei_iso2022_jp},
1114     {-1}, {-1}, {-1},
1115 #line 105 "lib/aliases.gperf"
1116-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str665, ei_iso8859_7},
1117+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str665, ei_iso8859_7},
1118 #line 278 "lib/aliases.gperf"
1119-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str666, ei_jisx0208},
1120+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str666, ei_jisx0208},
1121     {-1}, {-1}, {-1},
1122 #line 313 "lib/aliases.gperf"
1123-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str670, ei_iso2022_jp},
1124+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str670, ei_iso2022_jp},
1125     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1126 #line 223 "lib/aliases.gperf"
1127-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str680, ei_mac_arabic},
1128+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str680, ei_mac_arabic},
1129     {-1}, {-1},
1130 #line 271 "lib/aliases.gperf"
1131-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str683, ei_jisx0208},
1132+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str683, ei_jisx0208},
1133 #line 268 "lib/aliases.gperf"
1134-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str684, ei_jisx0201},
1135+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str684, ei_jisx0201},
1136     {-1}, {-1}, {-1}, {-1},
1137 #line 44 "lib/aliases.gperf"
1138-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str689, ei_utf7},
1139+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str689, ei_utf7},
1140 #line 42 "lib/aliases.gperf"
1141-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str690, ei_utf32be},
1142+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str690, ei_utf32be},
1143     {-1},
1144 #line 345 "lib/aliases.gperf"
1145-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str692, ei_big5hkscs2001},
1146+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str692, ei_big5hkscs2001},
1147     {-1},
1148 #line 281 "lib/aliases.gperf"
1149-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str694, ei_jisx0212},
1150+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str694, ei_jisx0212},
1151     {-1}, {-1},
1152 #line 280 "lib/aliases.gperf"
1153-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str697, ei_jisx0212},
1154+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str697, ei_jisx0212},
1155     {-1}, {-1},
1156 #line 346 "lib/aliases.gperf"
1157-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str700, ei_big5hkscs2004},
1158+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str700, ei_big5hkscs2004},
1159     {-1},
1160 #line 221 "lib/aliases.gperf"
1161-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str702, ei_mac_turkish},
1162+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str702, ei_mac_turkish},
1163     {-1}, {-1}, {-1}, {-1}, {-1},
1164 #line 349 "lib/aliases.gperf"
1165-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str708, ei_big5hkscs2008},
1166+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str708, ei_big5hkscs2008},
1167     {-1},
1168 #line 344 "lib/aliases.gperf"
1169-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str710, ei_big5hkscs1999},
1170+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str710, ei_big5hkscs1999},
1171     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1172     {-1}, {-1}, {-1}, {-1}, {-1},
1173 #line 185 "lib/aliases.gperf"
1174-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str725, ei_cp1254},
1175+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str725, ei_cp1254},
1176     {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1177 #line 50 "lib/aliases.gperf"
1178-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str732, ei_ucs4swapped},
1179+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str732, ei_ucs4swapped},
1180     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1181     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1182 #line 219 "lib/aliases.gperf"
1183-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str749, ei_mac_ukraine},
1184+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str749, ei_mac_ukraine},
1185 #line 48 "lib/aliases.gperf"
1186-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str750, ei_ucs2swapped},
1187+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str750, ei_ucs2swapped},
1188     {-1},
1189 #line 261 "lib/aliases.gperf"
1190-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str752, ei_tcvn},
1191+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str752, ei_tcvn},
1192     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1193     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1194     {-1}, {-1}, {-1},
1195 #line 273 "lib/aliases.gperf"
1196-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str774, ei_jisx0208},
1197+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str774, ei_jisx0208},
1198     {-1}, {-1}, {-1}, {-1},
1199 #line 272 "lib/aliases.gperf"
1200-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str779, ei_jisx0208},
1201+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str779, ei_jisx0208},
1202     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1203     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1204 #line 222 "lib/aliases.gperf"
1205-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str796, ei_mac_hebrew},
1206+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str796, ei_mac_hebrew},
1207     {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1208 #line 191 "lib/aliases.gperf"
1209-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str803, ei_cp1256},
1210+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str803, ei_cp1256},
1211     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1212 #line 52 "lib/aliases.gperf"
1213-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str811, ei_java},
1214+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str811, ei_java},
1215     {-1},
1216 #line 217 "lib/aliases.gperf"
1217-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str813, ei_mac_romania},
1218+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str813, ei_mac_romania},
1219     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1220     {-1}, {-1}, {-1}, {-1},
1221 #line 309 "lib/aliases.gperf"
1222-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str827, ei_sjis},
1223+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str827, ei_sjis},
1224     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1225 #line 194 "lib/aliases.gperf"
1226-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str837, ei_cp1257},
1227+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str837, ei_cp1257},
1228     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1229     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1230     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1231     {-1},
1232 #line 305 "lib/aliases.gperf"
1233-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str866, ei_euc_jp},
1234+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str866, ei_euc_jp},
1235     {-1}, {-1},
1236 #line 355 "lib/aliases.gperf"
1237-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str869, ei_johab},
1238+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str869, ei_johab},
1239     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1240     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1241     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1242@@ -1706,7 +1706,7 @@
1243     {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1244     {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
1245 #line 270 "lib/aliases.gperf"
1246-    {(int)(long)&((struct stringpool_t *)0)->stringpool_str921, ei_jisx0201}
1247+    {(int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str921, ei_jisx0201}
1248   };
1249
1250 #ifdef __GNUC__
1251--- iconv/lib/iconv.c.orig	2017-04-11 11:27:20.897795458 +0200
1252+++ iconv/lib/iconv.c	2017-04-11 11:27:43.769749249 +0200
1253@@ -20,6 +20,7 @@
1254 #include <iconv.h>
1255
1256 #include <limits.h>
1257+#include <stdint.h>
1258 #include <stdlib.h>
1259 #include <string.h>
1260 #include "config.h"
1261@@ -172,7 +173,7 @@
1262 };
1263 #define stringpool2 ((const char *) &stringpool2_contents)
1264 static const struct alias sysdep_aliases[] = {
1265-#define S(tag,name,encoding_index) { (int)(long)&((struct stringpool2_t *)0)->stringpool_##tag, encoding_index },
1266+#define S(tag,name,encoding_index) { (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_##tag, encoding_index },
1267 #include "aliases2.h"
1268 #undef S
1269 };
1270--- iconv/lib/canonical.h.orig	2017-04-11 11:31:05.769401908 +0200
1271+++ iconv/lib/canonical.h	2017-04-11 11:31:07.269399680 +0200
1272@@ -1,111 +1,111 @@
1273-  (int)(long)&((struct stringpool_t *)0)->stringpool_str392,
1274-  (int)(long)&((struct stringpool_t *)0)->stringpool_str389,
1275-  (int)(long)&((struct stringpool_t *)0)->stringpool_str258,
1276-  (int)(long)&((struct stringpool_t *)0)->stringpool_str436,
1277-  (int)(long)&((struct stringpool_t *)0)->stringpool_str285,
1278-  (int)(long)&((struct stringpool_t *)0)->stringpool_str222,
1279-  (int)(long)&((struct stringpool_t *)0)->stringpool_str418,
1280-  (int)(long)&((struct stringpool_t *)0)->stringpool_str267,
1281-  (int)(long)&((struct stringpool_t *)0)->stringpool_str361,
1282-  (int)(long)&((struct stringpool_t *)0)->stringpool_str567,
1283-  (int)(long)&((struct stringpool_t *)0)->stringpool_str416,
1284-  (int)(long)&((struct stringpool_t *)0)->stringpool_str512,
1285-  (int)(long)&((struct stringpool_t *)0)->stringpool_str690,
1286-  (int)(long)&((struct stringpool_t *)0)->stringpool_str539,
1287-  (int)(long)&((struct stringpool_t *)0)->stringpool_str689,
1288-  (int)(long)&((struct stringpool_t *)0)->stringpool_str320,
1289-  (int)(long)&((struct stringpool_t *)0)->stringpool_str750,
1290-  (int)(long)&((struct stringpool_t *)0)->stringpool_str302,
1291-  (int)(long)&((struct stringpool_t *)0)->stringpool_str732,
1292-  (int)(long)&((struct stringpool_t *)0)->stringpool_str64,
1293-  (int)(long)&((struct stringpool_t *)0)->stringpool_str811,
1294-  (int)(long)&((struct stringpool_t *)0)->stringpool_str134,
1295-  (int)(long)&((struct stringpool_t *)0)->stringpool_str186,
1296-  (int)(long)&((struct stringpool_t *)0)->stringpool_str324,
1297-  (int)(long)&((struct stringpool_t *)0)->stringpool_str150,
1298-  (int)(long)&((struct stringpool_t *)0)->stringpool_str154,
1299-  (int)(long)&((struct stringpool_t *)0)->stringpool_str130,
1300-  (int)(long)&((struct stringpool_t *)0)->stringpool_str466,
1301-  (int)(long)&((struct stringpool_t *)0)->stringpool_str166,
1302-  (int)(long)&((struct stringpool_t *)0)->stringpool_str170,
1303-  (int)(long)&((struct stringpool_t *)0)->stringpool_str322,
1304-  (int)(long)&((struct stringpool_t *)0)->stringpool_str142,
1305-  (int)(long)&((struct stringpool_t *)0)->stringpool_str332,
1306-  (int)(long)&((struct stringpool_t *)0)->stringpool_str158,
1307-  (int)(long)&((struct stringpool_t *)0)->stringpool_str162,
1308-  (int)(long)&((struct stringpool_t *)0)->stringpool_str138,
1309-  (int)(long)&((struct stringpool_t *)0)->stringpool_str236,
1310-  (int)(long)&((struct stringpool_t *)0)->stringpool_str574,
1311-  (int)(long)&((struct stringpool_t *)0)->stringpool_str580,
1312-  (int)(long)&((struct stringpool_t *)0)->stringpool_str268,
1313-  (int)(long)&((struct stringpool_t *)0)->stringpool_str88,
1314-  (int)(long)&((struct stringpool_t *)0)->stringpool_str140,
1315-  (int)(long)&((struct stringpool_t *)0)->stringpool_str278,
1316-  (int)(long)&((struct stringpool_t *)0)->stringpool_str104,
1317-  (int)(long)&((struct stringpool_t *)0)->stringpool_str108,
1318-  (int)(long)&((struct stringpool_t *)0)->stringpool_str84,
1319-  (int)(long)&((struct stringpool_t *)0)->stringpool_str420,
1320-  (int)(long)&((struct stringpool_t *)0)->stringpool_str120,
1321-  (int)(long)&((struct stringpool_t *)0)->stringpool_str250,
1322-  (int)(long)&((struct stringpool_t *)0)->stringpool_str110,
1323-  (int)(long)&((struct stringpool_t *)0)->stringpool_str54,
1324-  (int)(long)&((struct stringpool_t *)0)->stringpool_str147,
1325-  (int)(long)&((struct stringpool_t *)0)->stringpool_str476,
1326-  (int)(long)&((struct stringpool_t *)0)->stringpool_str463,
1327-  (int)(long)&((struct stringpool_t *)0)->stringpool_str442,
1328-  (int)(long)&((struct stringpool_t *)0)->stringpool_str562,
1329-  (int)(long)&((struct stringpool_t *)0)->stringpool_str813,
1330-  (int)(long)&((struct stringpool_t *)0)->stringpool_str248,
1331-  (int)(long)&((struct stringpool_t *)0)->stringpool_str749,
1332-  (int)(long)&((struct stringpool_t *)0)->stringpool_str591,
1333-  (int)(long)&((struct stringpool_t *)0)->stringpool_str702,
1334-  (int)(long)&((struct stringpool_t *)0)->stringpool_str796,
1335-  (int)(long)&((struct stringpool_t *)0)->stringpool_str680,
1336-  (int)(long)&((struct stringpool_t *)0)->stringpool_str430,
1337-  (int)(long)&((struct stringpool_t *)0)->stringpool_str448,
1338-  (int)(long)&((struct stringpool_t *)0)->stringpool_str311,
1339-  (int)(long)&((struct stringpool_t *)0)->stringpool_str391,
1340-  (int)(long)&((struct stringpool_t *)0)->stringpool_str446,
1341-  (int)(long)&((struct stringpool_t *)0)->stringpool_str312,
1342-  (int)(long)&((struct stringpool_t *)0)->stringpool_str286,
1343-  (int)(long)&((struct stringpool_t *)0)->stringpool_str121,
1344-  (int)(long)&((struct stringpool_t *)0)->stringpool_str176,
1345-  (int)(long)&((struct stringpool_t *)0)->stringpool_str375,
1346-  (int)(long)&((struct stringpool_t *)0)->stringpool_str337,
1347-  (int)(long)&((struct stringpool_t *)0)->stringpool_str282,
1348-  (int)(long)&((struct stringpool_t *)0)->stringpool_str242,
1349-  (int)(long)&((struct stringpool_t *)0)->stringpool_str206,
1350-  (int)(long)&((struct stringpool_t *)0)->stringpool_str211,
1351-  (int)(long)&((struct stringpool_t *)0)->stringpool_str536,
1352-  (int)(long)&((struct stringpool_t *)0)->stringpool_str651,
1353-  (int)(long)&((struct stringpool_t *)0)->stringpool_str683,
1354-  (int)(long)&((struct stringpool_t *)0)->stringpool_str613,
1355-  (int)(long)&((struct stringpool_t *)0)->stringpool_str329,
1356-  (int)(long)&((struct stringpool_t *)0)->stringpool_str426,
1357-  (int)(long)&((struct stringpool_t *)0)->stringpool_str89,
1358-  (int)(long)&((struct stringpool_t *)0)->stringpool_str344,
1359-  (int)(long)&((struct stringpool_t *)0)->stringpool_str479,
1360-  (int)(long)&((struct stringpool_t *)0)->stringpool_str548,
1361-  (int)(long)&((struct stringpool_t *)0)->stringpool_str209,
1362-  (int)(long)&((struct stringpool_t *)0)->stringpool_str661,
1363-  (int)(long)&((struct stringpool_t *)0)->stringpool_str608,
1364-  (int)(long)&((struct stringpool_t *)0)->stringpool_str634,
1365-  (int)(long)&((struct stringpool_t *)0)->stringpool_str610,
1366-  (int)(long)&((struct stringpool_t *)0)->stringpool_str72,
1367-  (int)(long)&((struct stringpool_t *)0)->stringpool_str388,
1368-  (int)(long)&((struct stringpool_t *)0)->stringpool_str153,
1369-  (int)(long)&((struct stringpool_t *)0)->stringpool_str443,
1370-  (int)(long)&((struct stringpool_t *)0)->stringpool_str254,
1371-  (int)(long)&((struct stringpool_t *)0)->stringpool_str281,
1372-  (int)(long)&((struct stringpool_t *)0)->stringpool_str78,
1373-  (int)(long)&((struct stringpool_t *)0)->stringpool_str437,
1374-  (int)(long)&((struct stringpool_t *)0)->stringpool_str210,
1375-  (int)(long)&((struct stringpool_t *)0)->stringpool_str252,
1376-  (int)(long)&((struct stringpool_t *)0)->stringpool_str710,
1377-  (int)(long)&((struct stringpool_t *)0)->stringpool_str692,
1378-  (int)(long)&((struct stringpool_t *)0)->stringpool_str700,
1379-  (int)(long)&((struct stringpool_t *)0)->stringpool_str495,
1380-  (int)(long)&((struct stringpool_t *)0)->stringpool_str243,
1381-  (int)(long)&((struct stringpool_t *)0)->stringpool_str106,
1382-  (int)(long)&((struct stringpool_t *)0)->stringpool_str869,
1383-  (int)(long)&((struct stringpool_t *)0)->stringpool_str425,
1384+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str392,
1385+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str389,
1386+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str258,
1387+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str436,
1388+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str285,
1389+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str222,
1390+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str418,
1391+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str267,
1392+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str361,
1393+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str567,
1394+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str416,
1395+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str512,
1396+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str690,
1397+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str539,
1398+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str689,
1399+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str320,
1400+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str750,
1401+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str302,
1402+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str732,
1403+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str64,
1404+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str811,
1405+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str134,
1406+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str186,
1407+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str324,
1408+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str150,
1409+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str154,
1410+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str130,
1411+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str466,
1412+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str166,
1413+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str170,
1414+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str322,
1415+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str142,
1416+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str332,
1417+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str158,
1418+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str162,
1419+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str138,
1420+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str236,
1421+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str574,
1422+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str580,
1423+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str268,
1424+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str88,
1425+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str140,
1426+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str278,
1427+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str104,
1428+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str108,
1429+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str84,
1430+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str420,
1431+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str120,
1432+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str250,
1433+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str110,
1434+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str54,
1435+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str147,
1436+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str476,
1437+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str463,
1438+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str442,
1439+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str562,
1440+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str813,
1441+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str248,
1442+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str749,
1443+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str591,
1444+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str702,
1445+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str796,
1446+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str680,
1447+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str430,
1448+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str448,
1449+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str311,
1450+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str391,
1451+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str446,
1452+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str312,
1453+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str286,
1454+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str121,
1455+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str176,
1456+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str375,
1457+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str337,
1458+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str282,
1459+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str242,
1460+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str206,
1461+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str211,
1462+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str536,
1463+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str651,
1464+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str683,
1465+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str613,
1466+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str329,
1467+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str426,
1468+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str89,
1469+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str344,
1470+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str479,
1471+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str548,
1472+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str209,
1473+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str661,
1474+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str608,
1475+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str634,
1476+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str610,
1477+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str72,
1478+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str388,
1479+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str153,
1480+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str443,
1481+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str254,
1482+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str281,
1483+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str78,
1484+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str437,
1485+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str210,
1486+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str252,
1487+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str710,
1488+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str692,
1489+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str700,
1490+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str495,
1491+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str243,
1492+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str106,
1493+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str869,
1494+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str425,
1495--- iconv/lib/canonical_dos.h.orig	2017-04-11 11:32:10.665309524 +0200
1496+++ iconv/lib/canonical_dos.h	2017-04-11 11:32:20.421296308 +0200
1497@@ -1,15 +1,15 @@
1498-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_0,
1499-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_4,
1500-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_5,
1501-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_8,
1502-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_12,
1503-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_13,
1504-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_17,
1505-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_21,
1506-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_22,
1507-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_26,
1508-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_31,
1509-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_35,
1510-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_38,
1511-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_42,
1512-  (int)(long)&((struct stringpool2_t *)0)->stringpool_dos_47,
1513+  (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_0,
1514+  (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_4,
1515+  (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_5,
1516+  (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_8,
1517+  (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_12,
1518+  (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_13,
1519+  (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_17,
1520+  (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_21,
1521+  (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_22,
1522+  (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_26,
1523+  (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_31,
1524+  (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_35,
1525+  (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_38,
1526+  (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_42,
1527+  (int)(intptr_t)&((struct stringpool2_t *)0)->stringpool_dos_47,
1528--- iconv/lib/canonical_local.h.orig	2017-04-11 11:33:25.529212196 +0200
1529+++ iconv/lib/canonical_local.h	2017-04-11 11:33:31.549204764 +0200
1530@@ -1,2 +1,2 @@
1531-  (int)(long)&((struct stringpool_t *)0)->stringpool_str193,
1532-  (int)(long)&((struct stringpool_t *)0)->stringpool_str496,
1533+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str193,
1534+  (int)(intptr_t)&((struct stringpool_t *)0)->stringpool_str496,
1535