forked from winlibs/libiconv
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathlibiconv.diff
2291 lines (2285 loc) · 113 KB
/
libiconv.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -Npur libiconv-1.15/config.h source/config.h
--- libiconv-1.15/config.h 1970-01-01 01:00:00.000000000 +0100
+++ source/config.h 2017-03-14 12:28:01.768392700 +0100
@@ -0,0 +1,404 @@
+/* config.h. Generated from config.h.in by configure. */
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+/* Define to the number of bits in type 'ptrdiff_t'. */
+#define BITSIZEOF_PTRDIFF_T 0
+
+/* Define to the number of bits in type 'sig_atomic_t'. */
+#define BITSIZEOF_SIG_ATOMIC_T 0
+
+/* Define to the number of bits in type 'size_t'. */
+#define BITSIZEOF_SIZE_T 0
+
+/* Define to the number of bits in type 'wchar_t'. */
+#define BITSIZEOF_WCHAR_T 0
+
+/* Define to the number of bits in type 'wint_t'. */
+#define BITSIZEOF_WINT_T 0
+
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+ systems. This function is required for `alloca.c' support on those systems.
+ */
+/* #undef CRAY_STACKSEG_END */
+
+/* Define to 1 if using `alloca.c'. */
+#define C_ALLOCA 1
+
+/* Define as good substitute value for EILSEQ. */
+/* #undef EILSEQ */
+
+/* Define to 1 to enable a few rarely used encodings. */
+/* #undef ENABLE_EXTRA */
+
+/* Define to 1 if translation of program messages to the user's native
+ language is requested. */
+/* #undef ENABLE_NLS */
+
+/* Define to 1 if the package shall run at any location in the filesystem. */
+/* #define ENABLE_RELOCATABLE 1 */
+
+/* Define to 1 if you have `alloca', as a function or macro. */
+/* #undef HAVE_ALLOCA */
+
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+ */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define to 1 if you have the `canonicalize_file_name' function. */
+/* #undef HAVE_CANONICALIZE_FILE_NAME */
+
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+ CoreFoundation framework. */
+/* #undef HAVE_CFLOCALECOPYCURRENT */
+
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+ the CoreFoundation framework. */
+/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+ */
+/* #undef HAVE_DCGETTEXT */
+
+/* Define to 1 if you have the declaration of `canonicalize_file_name', and to
+ 0 if you don't. */
+#define HAVE_DECL_CANONICALIZE_FILE_NAME 0
+
+/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if
+ you don't. */
+#define HAVE_DECL_CLEARERR_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
+ don't. */
+#define HAVE_DECL_FEOF_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if
+ you don't. */
+#define HAVE_DECL_FERROR_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if
+ you don't. */
+#define HAVE_DECL_FFLUSH_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
+ you don't. */
+#define HAVE_DECL_FGETS_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if
+ you don't. */
+#define HAVE_DECL_FPUTC_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if
+ you don't. */
+#define HAVE_DECL_FPUTS_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if
+ you don't. */
+#define HAVE_DECL_FREAD_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if
+ you don't. */
+#define HAVE_DECL_FWRITE_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if
+ you don't. */
+#define HAVE_DECL_GETCHAR_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
+ don't. */
+#define HAVE_DECL_GETC_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if
+ you don't. */
+#define HAVE_DECL_PUTCHAR_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you
+ don't. */
+#define HAVE_DECL_PUTC_UNLOCKED 0
+
+/* Define to 1 if you have the declaration of `strerror', and to 0 if you
+ don't. */
+#define HAVE_DECL_STRERROR 0
+
+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
+ don't. */
+#define HAVE_DECL_STRERROR_R 0
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+/* #undef HAVE_DLFCN_H */
+
+/* Define if you have the declaration of environ. */
+#define HAVE_ENVIRON_DECL 1
+
+/* Define to 1 if you have the `getcwd' function. */
+/* #undef HAVE_GETCWD */
+
+/* Define to 1 if you have the `getc_unlocked' function. */
+/* #undef HAVE_GETC_UNLOCKED */
+
+/* Define if the GNU gettext() function is already present or preinstalled. */
+/* #undef HAVE_GETTEXT */
+
+/* Define if you have the iconv() function and it works. */
+/* #undef HAVE_ICONV */
+
+/* Define if your compiler supports the #include_next directive. */
+/* #undef HAVE_INCLUDE_NEXT */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+/* #undef HAVE_INTTYPES_H */
+
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+/* #undef HAVE_LANGINFO_CODESET */
+
+/* Define to 1 if the system has the type `long long int'. */
+/* #undef HAVE_LONG_LONG_INT */
+
+/* Define to 1 if you have the <mach-o/dyld.h> header file. */
+/* #undef HAVE_MACH_O_DYLD_H */
+
+/* Define if the 'malloc' function is POSIX compliant. */
+/* #undef HAVE_MALLOC_POSIX */
+
+/* Define to 1 if you have the `mbrtowc' function. */
+#define HAVE_MBRTOWC 1
+
+/* Define to 1 if you have the `mbsinit' function. */
+#define HAVE_MBSINIT 1
+
+/* Define to 1 if <wchar.h> declares mbstate_t. */
+#define HAVE_MBSTATE_T 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+/* #undef HAVE_MEMORY_H */
+
+/* Define to 1 if you have the `readlink' function. */
+/* #undef HAVE_READLINK */
+
+/* Define to 1 if you have the <search.h> header file. */
+#define HAVE_SEARCH_H 1
+
+/* Define to 1 if you have the `setenv' function. */
+/* #undef HAVE_SETENV */
+
+/* Define to 1 if you have the `setlocale' function. */
+/* #undef HAVE_SETLOCALE */
+
+/* Define to 1 if 'sig_atomic_t' is a signed integer type. */
+/* #undef HAVE_SIGNED_SIG_ATOMIC_T */
+
+/* Define to 1 if 'wchar_t' is a signed integer type. */
+/* #undef HAVE_SIGNED_WCHAR_T */
+
+/* Define to 1 if 'wint_t' is a signed integer type. */
+/* #undef HAVE_SIGNED_WINT_T */
+
+/* Define to 1 if stdbool.h conforms to C99. */
+/* #undef HAVE_STDBOOL_H */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+/* #undef HAVE_STDINT_H */
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+/* #undef HAVE_STDLIB_H */
+
+/* Define to 1 if you have the `strerror_r' function. */
+/* #undef HAVE_STRERROR_R */
+
+/* Define to 1 if you have the <strings.h> header file. */
+/* #undef HAVE_STRINGS_H */
+
+/* Define to 1 if you have the <string.h> header file. */
+/* #undef HAVE_STRING_H */
+
+/* Define to 1 if you have the <sys/bitypes.h> header file. */
+/* #undef HAVE_SYS_BITYPES_H */
+
+/* Define to 1 if you have the <sys/inttypes.h> header file. */
+/* #undef HAVE_SYS_INTTYPES_H */
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+/* #undef HAVE_SYS_PARAM_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+/* #undef HAVE_SYS_STAT_H */
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+/* #undef HAVE_SYS_TYPES_H */
+
+/* Define to 1 if you have the `tsearch' function. */
+/* #undef HAVE_TSEARCH */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+/* #undef HAVE_UNISTD_H */
+
+/* Define to 1 if the system has the type `unsigned long long int'. */
+/* #undef HAVE_UNSIGNED_LONG_LONG_INT */
+
+/* Define to 1 or 0, depending whether the compiler supports simple visibility
+ declarations. */
+#define HAVE_VISIBILITY 0
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
+/* Define if you have the 'wchar_t' type. */
+/* #undef HAVE_WCHAR_T */
+
+/* Define to 1 if you have the `wcrtomb' function. */
+/* #undef HAVE_WCRTOMB */
+
+/* Define to 1 if the system has the type `_Bool'. */
+/* #undef HAVE__BOOL */
+
+/* Define to 1 if you have the `_NSGetExecutablePath' function. */
+/* #undef HAVE__NSGETEXECUTABLEPATH */
+
+/* Define as const if the declaration of iconv() needs const. */
+/* #undef ICONV_CONST */
+
+/* Define to the value of ${prefix}, as a string. */
+/* #define INSTALLPREFIX "/usr/local" */
+
+/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
+#define MALLOC_0_IS_NONNULL 0
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#define NO_MINUS_C_MINUS_O 1
+
+/* Name of package */
+#define PACKAGE "libiconv"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+ 'ptrdiff_t'. */
+#define PTRDIFF_T_SUFFIX
+
+/* Define this to 1 if strerror is broken. */
+#define REPLACE_STRERROR 1
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+ 'sig_atomic_t'. */
+#define SIG_ATOMIC_T_SUFFIX
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+ 'size_t'. */
+#define SIZE_T_SUFFIX
+
+/* If using the C implementation of alloca, define if you know the
+ direction of stack growth for your system; otherwise it will be
+ automatically deduced at runtime.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown */
+#define STACK_DIRECTION -1
+
+/* Define to 1 if you have the ANSI C header files. */
+/* #undef STDC_HEADERS */
+
+/* Define to 1 if strerror_r returns char *. */
+/* #undef STRERROR_R_CHAR_P */
+
+/* Define to 1 if you want getc etc. to use unlocked I/O if available.
+ Unlocked I/O can improve performance in unithreaded apps, but it is not
+ safe for multithreaded apps. */
+#define USE_UNLOCKED_IO 0
+
+/* Version number of package */
+#define VERSION "1.12"
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+ 'wchar_t'. */
+#define WCHAR_T_SUFFIX
+
+/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
+ 'wint_t'. */
+#define WINT_T_SUFFIX
+
+/* Define if the machine's byte ordering is little endian. */
+#define WORDS_LITTLEENDIAN 1
+
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+
+/* Define to 1 if on MINIX. */
+/* #undef _MINIX */
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+/* #undef _POSIX_1_SOURCE */
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+/* #undef _POSIX_SOURCE */
+
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# define _ALL_SOURCE 1
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# define _POSIX_PTHREAD_SEMANTICS 1
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# define _TANDEM_SOURCE 1
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+/* # undef __EXTENSIONS__ */
+#endif
+
+
+/* Define to a type if <wchar.h> does not define. */
+#if !defined(HAVE_MBSTATE_T) || _MSC_VER < 1900
+#define mbstate_t int
+#endif
+
+/* Define to a replacement function name for realpath(). */
+#define realpath rpl_realpath
+
+/* Define to the equivalent of the C99 'restrict' keyword, or to
+ nothing if this is not supported. Do not define if restrict is
+ supported directly. */
+#define restrict
+/* Work around a bug in Sun C++: it does not support _Restrict, even
+ though the corresponding Sun C compiler does, which causes
+ "#define restrict _Restrict" in the previous line. Perhaps some future
+ version of Sun C++ will work with _Restrict; if so, it'll probably
+ define __RESTRICT, just as Sun C does. */
+#if defined __SUNPRO_CC && !defined __RESTRICT
+# define _Restrict
+#endif
+
+/* Define as a signed type of the same size as size_t. */
+#define ssize_t int
+
+/* On Windows, variables that may be in a DLL must be marked specially. */
+#if defined _MSC_VER && defined _DLL
+# define DLL_VARIABLE __declspec (dllimport)
+#else
+# define DLL_VARIABLE
+#endif
+
diff -Npur libiconv-1.15/include/iconv.h source/include/iconv.h
--- libiconv-1.15/include/iconv.h 1970-01-01 01:00:00.000000000 +0100
+++ source/include/iconv.h 2017-03-13 16:21:21.286316500 +0100
@@ -0,0 +1,245 @@
+/* Copyright (C) 1999-2003, 2005-2006, 2008-2011 Free Software Foundation, Inc.
+ This file is part of the GNU LIBICONV Library.
+
+ The GNU LIBICONV Library is free software; you can redistribute it
+ and/or modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ The GNU LIBICONV Library is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU LIBICONV Library; see the file COPYING.LIB.
+ If not, see <http://www.gnu.org/licenses/>. */
+
+/* When installed, this file is called "iconv.h". */
+
+#ifndef _LIBICONV_H
+#define _LIBICONV_H
+
+#define _LIBICONV_VERSION 0x010F /* version number: (major<<8) + minor */
+
+#ifdef BUILDING_LIBICONV
+#define LIBICONV_DLL_EXPORTED __declspec(dllexport)
+#elif LIBICONV_DLL
+#define LIBICONV_DLL_EXPORTED __declspec(dllimport)
+#else
+#define LIBICONV_DLL_EXPORTED
+#endif
+extern LIBICONV_DLL_EXPORTED int _libiconv_version;
+
+/* We would like to #include any system header file which could define
+ iconv_t, 1. in order to eliminate the risk that the user gets compilation
+ errors because some other system header file includes /usr/include/iconv.h
+ which defines iconv_t or declares iconv after this file, 2. when compiling
+ for LIBICONV_PLUG, we need the proper iconv_t type in order to produce
+ binary compatible code.
+ But gcc's #include_next is not portable. Thus, once libiconv's iconv.h
+ has been installed in /usr/local/include, there is no way any more to
+ include the original /usr/include/iconv.h. We simply have to get away
+ without it.
+ Ad 1. The risk that a system header file does
+ #include "iconv.h" or #include_next "iconv.h"
+ is small. They all do #include <iconv.h>.
+ Ad 2. The iconv_t type is a pointer type in all cases I have seen. (It
+ has to be a scalar type because (iconv_t)(-1) is a possible return value
+ from iconv_open().) */
+
+/* Define iconv_t ourselves. */
+#undef iconv_t
+#define iconv_t libiconv_t
+typedef void* iconv_t;
+
+/* Get size_t declaration.
+ Get wchar_t declaration if it exists. */
+#include <stddef.h>
+
+/* Get errno declaration and values. */
+#include <errno.h>
+/* Some systems, like SunOS 4, don't have EILSEQ. Some systems, like BSD/OS,
+ have EILSEQ in a different header. On these systems, define EILSEQ
+ ourselves. */
+#ifndef EILSEQ
+#define EILSEQ
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Allocates descriptor for code conversion from encoding `fromcode' to
+ encoding `tocode'. */
+#ifndef LIBICONV_PLUG
+#define iconv_open libiconv_open
+#endif
+extern LIBICONV_DLL_EXPORTED iconv_t iconv_open (const char* tocode, const char* fromcode);
+
+/* Converts, using conversion descriptor `cd', at most `*inbytesleft' bytes
+ starting at `*inbuf', writing at most `*outbytesleft' bytes starting at
+ `*outbuf'.
+ Decrements `*inbytesleft' and increments `*inbuf' by the same amount.
+ Decrements `*outbytesleft' and increments `*outbuf' by the same amount. */
+#ifndef LIBICONV_PLUG
+#define iconv libiconv
+#endif
+extern LIBICONV_DLL_EXPORTED size_t iconv (iconv_t cd, char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft);
+
+/* Frees resources allocated for conversion descriptor `cd'. */
+#ifndef LIBICONV_PLUG
+#define iconv_close libiconv_close
+#endif
+extern LIBICONV_DLL_EXPORTED int iconv_close (iconv_t cd);
+
+
+#ifndef LIBICONV_PLUG
+
+/* Nonstandard extensions. */
+
+#if USE_MBSTATE_T
+#if BROKEN_WCHAR_H
+/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+ <wchar.h>.
+ BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+ included before <wchar.h>. */
+#include <stddef.h>
+#include <stdio.h>
+#include <time.h>
+#endif
+#include <wchar.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* A type that holds all memory needed by a conversion descriptor.
+ A pointer to such an object can be used as an iconv_t. */
+typedef struct {
+ void* dummy1[28];
+#if USE_MBSTATE_T
+ mbstate_t dummy2;
+#endif
+} iconv_allocation_t;
+
+/* Allocates descriptor for code conversion from encoding ‘fromcode’ to
+ encoding ‘tocode’ into preallocated memory. Returns an error indicator
+ (0 or -1 with errno set). */
+#define iconv_open_into libiconv_open_into
+extern int iconv_open_into (const char* tocode, const char* fromcode,
+ iconv_allocation_t* resultp);
+
+/* Control of attributes. */
+#define iconvctl libiconvctl
+extern LIBICONV_DLL_EXPORTED int iconvctl (iconv_t cd, int request, void* argument);
+
+/* Hook performed after every successful conversion of a Unicode character. */
+typedef void (*iconv_unicode_char_hook) (unsigned int uc, void* data);
+/* Hook performed after every successful conversion of a wide character. */
+typedef void (*iconv_wide_char_hook) (wchar_t wc, void* data);
+/* Set of hooks. */
+struct iconv_hooks {
+ iconv_unicode_char_hook uc_hook;
+ iconv_wide_char_hook wc_hook;
+ void* data;
+};
+
+/* Fallback function. Invoked when a small number of bytes could not be
+ converted to a Unicode character. This function should process all
+ bytes from inbuf and may produce replacement Unicode characters by calling
+ the write_replacement callback repeatedly. */
+typedef void (*iconv_unicode_mb_to_uc_fallback)
+ (const char* inbuf, size_t inbufsize,
+ void (*write_replacement) (const unsigned int *buf, size_t buflen,
+ void* callback_arg),
+ void* callback_arg,
+ void* data);
+/* Fallback function. Invoked when a Unicode character could not be converted
+ to the target encoding. This function should process the character and
+ may produce replacement bytes (in the target encoding) by calling the
+ write_replacement callback repeatedly. */
+typedef void (*iconv_unicode_uc_to_mb_fallback)
+ (unsigned int code,
+ void (*write_replacement) (const char *buf, size_t buflen,
+ void* callback_arg),
+ void* callback_arg,
+ void* data);
+#if 0
+/* Fallback function. Invoked when a number of bytes could not be converted to
+ a wide character. This function should process all bytes from inbuf and may
+ produce replacement wide characters by calling the write_replacement
+ callback repeatedly. */
+typedef void (*iconv_wchar_mb_to_wc_fallback)
+ (const char* inbuf, size_t inbufsize,
+ void (*write_replacement) (const wchar_t *buf, size_t buflen,
+ void* callback_arg),
+ void* callback_arg,
+ void* data);
+/* Fallback function. Invoked when a wide character could not be converted to
+ the target encoding. This function should process the character and may
+ produce replacement bytes (in the target encoding) by calling the
+ write_replacement callback repeatedly. */
+typedef void (*iconv_wchar_wc_to_mb_fallback)
+ (wchar_t code,
+ void (*write_replacement) (const char *buf, size_t buflen,
+ void* callback_arg),
+ void* callback_arg,
+ void* data);
+#else
+/* If the wchar_t type does not exist, these two fallback functions are never
+ invoked. Their argument list therefore does not matter. */
+typedef void (*iconv_wchar_mb_to_wc_fallback) ();
+typedef void (*iconv_wchar_wc_to_mb_fallback) ();
+#endif
+/* Set of fallbacks. */
+struct iconv_fallbacks {
+ iconv_unicode_mb_to_uc_fallback mb_to_uc_fallback;
+ iconv_unicode_uc_to_mb_fallback uc_to_mb_fallback;
+ iconv_wchar_mb_to_wc_fallback mb_to_wc_fallback;
+ iconv_wchar_wc_to_mb_fallback wc_to_mb_fallback;
+ void* data;
+};
+
+/* Requests for iconvctl. */
+#define ICONV_TRIVIALP 0 /* int *argument */
+#define ICONV_GET_TRANSLITERATE 1 /* int *argument */
+#define ICONV_SET_TRANSLITERATE 2 /* const int *argument */
+#define ICONV_GET_DISCARD_ILSEQ 3 /* int *argument */
+#define ICONV_SET_DISCARD_ILSEQ 4 /* const int *argument */
+#define ICONV_SET_HOOKS 5 /* const struct iconv_hooks *argument */
+#define ICONV_SET_FALLBACKS 6 /* const struct iconv_fallbacks *argument */
+
+/* Listing of locale independent encodings. */
+#define iconvlist libiconvlist
+extern LIBICONV_DLL_EXPORTED void iconvlist (int (*do_one) (unsigned int namescount,
+ const char * const * names,
+ void* data),
+ void* data);
+
+/* Canonicalize an encoding name.
+ The result is either a canonical encoding name, or name itself. */
+extern LIBICONV_DLL_EXPORTED const char * iconv_canonicalize (const char * name);
+
+/* Support for relocatable packages. */
+
+/* Sets the original and the current installation prefix of the package.
+ Relocation simply replaces a pathname starting with the original prefix
+ by the corresponding pathname with the current prefix instead. Both
+ prefixes should be directory names without trailing slash (i.e. use ""
+ instead of "/"). */
+extern LIBICONV_DLL_EXPORTED void libiconv_set_relocation_prefix (const char *orig_prefix,
+ const char *curr_prefix);
+
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _LIBICONV_H */
diff -Npur libiconv-1.15/lib/aliases.h source/lib/aliases.h
--- libiconv-1.15/lib/aliases.h 2017-01-02 00:02:56.000000000 +0100
+++ source/lib/aliases.h 2017-03-13 17:46:21.868377200 +0100
@@ -2,6 +2,14 @@
/* Command-line: gperf -m 10 lib/aliases.gperf */
/* Computed positions: -k'1,3-11,$' */
+#ifndef INT_PTR
+#if _WIN64
+#define INT_PTR __int64
+#else
+#define INT_PTR __int32
+#endif
+#endif
+
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
&& ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
&& (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
@@ -815,890 +823,890 @@ static const struct alias aliases[] =
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1},
#line 134 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str15, ei_iso8859_10},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str15, ei_iso8859_10},
{-1},
#line 60 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str17, ei_iso8859_1},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str17, ei_iso8859_1},
{-1}, {-1},
#line 288 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str20, ei_iso646_cn},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str20, ei_iso646_cn},
{-1}, {-1}, {-1}, {-1},
#line 84 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str25, ei_iso8859_4},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str25, ei_iso8859_4},
{-1},
#line 126 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str27, ei_iso8859_9},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str27, ei_iso8859_9},
{-1}, {-1},
#line 227 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str30, ei_hp_roman8},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str30, ei_hp_roman8},
{-1}, {-1},
#line 151 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str33, ei_iso8859_14},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str33, ei_iso8859_14},
#line 308 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str34, ei_sjis},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str34, ei_sjis},
{-1},
#line 207 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str36, ei_cp866},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str36, ei_cp866},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1},
#line 68 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str43, ei_iso8859_2},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str43, ei_iso8859_2},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
#line 16 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str51, ei_ascii},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str51, ei_ascii},
{-1}, {-1},
#line 205 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str54, ei_cp866},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str54, ei_cp866},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
#line 51 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str64, ei_c99},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str64, ei_c99},
#line 252 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str65, ei_tis620},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str65, ei_tis620},
#line 320 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str66, ei_euc_cn},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str66, ei_euc_cn},
#line 133 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str67, ei_iso8859_10},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str67, ei_iso8859_10},
{-1}, {-1},
#line 236 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str70, ei_pt154},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str70, ei_pt154},
#line 59 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str71, ei_iso8859_1},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str71, ei_iso8859_1},
#line 319 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str72, ei_euc_cn},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str72, ei_euc_cn},
{-1},
#line 91 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str74, ei_iso8859_5},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str74, ei_iso8859_5},
{-1},
#line 286 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str76, ei_iso646_cn},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str76, ei_iso646_cn},
{-1},
#line 332 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str78, ei_hz},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str78, ei_hz},
#line 264 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str79, ei_iso646_jp},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str79, ei_iso646_jp},
{-1}, {-1}, {-1}, {-1},
#line 189 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str84, ei_cp1256},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str84, ei_cp1256},
{-1}, {-1},
#line 83 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str87, ei_iso8859_4},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str87, ei_iso8859_4},
#line 174 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str88, ei_cp1251},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str88, ei_cp1251},
#line 294 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str89, ei_isoir165},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str89, ei_isoir165},
{-1},
#line 125 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str91, ei_iso8859_9},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str91, ei_iso8859_9},
#line 203 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str92, ei_cp862},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str92, ei_cp862},
#line 107 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str93, ei_iso8859_7},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str93, ei_iso8859_7},
{-1},
#line 90 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str95, ei_iso8859_5},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str95, ei_iso8859_5},
#line 57 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str96, ei_iso8859_1},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str96, ei_iso8859_1},
{-1}, {-1}, {-1}, {-1}, {-1}, {-1},
#line 150 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str103, ei_iso8859_14},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str103, ei_iso8859_14},
#line 183 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str104, ei_cp1254},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str104, ei_cp1254},
#line 291 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str105, ei_gb2312},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str105, ei_gb2312},
#line 353 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str106, ei_cp949},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str106, ei_cp949},
{-1},
#line 186 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str108, ei_cp1255},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str108, ei_cp1255},
{-1},
#line 201 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str110, ei_cp862},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str110, ei_cp862},
#line 124 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str111, ei_iso8859_9},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str111, ei_iso8859_9},
#line 76 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str112, ei_iso8859_3},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str112, ei_iso8859_3},
#line 158 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str113, ei_iso8859_15},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str113, ei_iso8859_15},
#line 293 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str114, ei_gb2312},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str114, ei_gb2312},
#line 299 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str115, ei_ksc5601},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str115, ei_ksc5601},
{-1},
#line 283 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str117, ei_jisx0212},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str117, ei_jisx0212},
{-1},
#line 163 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str119, ei_iso8859_16},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str119, ei_iso8859_16},
#line 195 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str120, ei_cp1258},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str120, ei_cp1258},
#line 234 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str121, ei_pt154},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str121, ei_pt154},
{-1},
#line 67 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str123, ei_iso8859_2},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str123, ei_iso8859_2},
#line 102 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str124, ei_iso8859_6},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str124, ei_iso8859_6},
#line 149 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str125, ei_iso8859_14},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str125, ei_iso8859_14},
{-1}, {-1},
#line 62 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str128, ei_iso8859_1},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str128, ei_iso8859_1},
#line 152 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str129, ei_iso8859_14},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str129, ei_iso8859_14},
#line 94 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str130, ei_iso8859_6},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str130, ei_iso8859_6},
#line 95 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str131, ei_iso8859_6},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str131, ei_iso8859_6},
#line 166 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str132, ei_iso8859_16},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str132, ei_iso8859_16},
{-1},
#line 53 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str134, ei_iso8859_1},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str134, ei_iso8859_1},
#line 54 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str135, ei_iso8859_1},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str135, ei_iso8859_1},
#line 139 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str136, ei_iso8859_11},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str136, ei_iso8859_11},
{-1},
#line 160 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str138, ei_iso8859_16},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str138, ei_iso8859_16},
#line 161 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str139, ei_iso8859_16},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str139, ei_iso8859_16},
#line 177 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str140, ei_cp1252},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str140, ei_cp1252},
{-1},
#line 137 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str142, ei_iso8859_11},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str142, ei_iso8859_11},
#line 138 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str143, ei_iso8859_11},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str143, ei_iso8859_11},
#line 86 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str144, ei_iso8859_4},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str144, ei_iso8859_4},
#line 356 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str145, ei_johab},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str145, ei_johab},
#line 162 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str146, ei_iso8859_16},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str146, ei_iso8859_16},
#line 209 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str147, ei_cp1131},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str147, ei_cp1131},
#line 93 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str148, ei_iso8859_5},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str148, ei_iso8859_5},
{-1},
#line 79 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str150, ei_iso8859_4},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str150, ei_iso8859_4},
#line 80 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str151, ei_iso8859_4},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str151, ei_iso8859_4},
#line 153 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str152, ei_iso8859_14},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str152, ei_iso8859_14},
#line 325 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str153, ei_cp936},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str153, ei_cp936},
#line 87 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str154, ei_iso8859_5},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str154, ei_iso8859_5},
#line 88 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str155, ei_iso8859_5},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str155, ei_iso8859_5},
#line 159 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str156, ei_iso8859_15},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str156, ei_iso8859_15},
#line 212 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str157, ei_mac_roman},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str157, ei_mac_roman},
#line 146 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str158, ei_iso8859_14},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str158, ei_iso8859_14},
#line 147 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str159, ei_iso8859_14},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str159, ei_iso8859_14},
#line 120 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str160, ei_iso8859_8},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str160, ei_iso8859_8},
#line 66 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str161, ei_iso8859_2},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str161, ei_iso8859_2},
#line 154 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str162, ei_iso8859_15},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str162, ei_iso8859_15},
#line 155 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str163, ei_iso8859_15},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str163, ei_iso8859_15},
#line 128 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str164, ei_iso8859_9},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str164, ei_iso8859_9},
{-1},
#line 114 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str166, ei_iso8859_8},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str166, ei_iso8859_8},
#line 115 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str167, ei_iso8859_8},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str167, ei_iso8859_8},
{-1}, {-1},
#line 121 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str170, ei_iso8859_9},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str170, ei_iso8859_9},
#line 122 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str171, ei_iso8859_9},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str171, ei_iso8859_9},
#line 148 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str172, ei_iso8859_14},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str172, ei_iso8859_14},
{-1},
#line 156 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str174, ei_iso8859_15},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str174, ei_iso8859_15},
{-1},
#line 239 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str176, ei_rk1048},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str176, ei_rk1048},
{-1}, {-1},
#line 109 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str179, ei_iso8859_7},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str179, ei_iso8859_7},
#line 70 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str180, ei_iso8859_2},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str180, ei_iso8859_2},
{-1},
#line 206 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str182, ei_cp866},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str182, ei_cp866},
#line 144 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str183, ei_iso8859_13},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str183, ei_iso8859_13},
#line 21 "lib/aliases.gperf"
- {(int)(long)&((struct stringpool_t *)0)->stringpool_str184, ei_ascii},
+ {(int)(INT_PTR)&((struct stringpool_t *)0)->stringpool_str184, ei_ascii},
{-1},