Skip to content

Commit eebde58

Browse files
ChenPi11ChenPi11
committed
Fix compile error in MinGW GNU GCC.
 修改： ChangeLog 修改： lib/genaliases.c 修改： lib/genaliases2.c 修改： lib/generated/canonical.h 修改： lib/generated/canonical_aix.h 修改： lib/generated/canonical_aix_sysaix.h 修改： lib/generated/canonical_dos.h 修改： lib/generated/canonical_extra.h 修改： lib/generated/canonical_osf1.h 修改： lib/generated/canonical_osf1_sysosf1.h 修改： lib/generated/canonical_sysaix.h 修改： lib/generated/canonical_syshpux.h 修改： lib/generated/canonical_sysosf1.h 修改： lib/generated/canonical_syssolaris.h 修改： lib/generated/canonical_zos.h 修改： lib/iconv.cpp
1 parent b29f7be commit eebde58

16 files changed

+661
-660
lines changed

‎ChangeLog‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
Fix some warnings in Clang.
99
Change the 'autodetect' feature of 'iconv_string' to a non extra feature.
1010
Update language maps.
11+
Fix compile error in MinGW GNU GCC.
1112

1213
2023-09-02 ChenPi11 <wushengwuxi-msctinoulk@outlook.com>
1314

‎lib/genaliases.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static void emit_encoding (FILE* out1, FILE* out2, const char* const* names, siz
6060
putc(c, out2);
6161
}
6262
}
63-
fprintf(out2,"\")' tmp.h | sed -e 's|^.*\\(stringpool_str[0-9]*\\).*$| (unsigned short)(long)\\&((struct stringpool_t *)0)->\\1,|'\n");
63+
fprintf(out2,"\")' tmp.h | sed -e 's|^.*\\(stringpool_str[0-9]*\\).*$| (unsigned short)(size_t)(void*)\\&((struct stringpool_t *)0)->\\1,|'\n");
6464
for (; n > 0; names++, n--)
6565
emit_alias(out1, *names, c_name);
6666
}

‎lib/genaliases2.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static void emit_alias (FILE* out1, const char* tag, const char* alias, const ch
4343

4444
static void emit_encoding (FILE* out1, FILE* out2, const char* tag, const char* const* names, size_t n, const char* c_name)
4545
{
46-
fprintf(out2," (unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_%s_%u,\n",tag,counter);
46+
fprintf(out2," (unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_%s_%u,\n",tag,counter);
4747
for (; n > 0; names++, n--)
4848
emit_alias(out1, tag, *names, c_name);
4949
}

‎lib/generated/canonical.h‎

Lines changed: 112 additions & 112 deletions
Large diffs are not rendered by default.

‎lib/generated/canonical_aix.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_0,
2-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_1,
3-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_2,
4-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_3,
5-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_4,
6-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_5,
7-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_6,
8-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_10,
9-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_14,
1+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_0,
2+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_1,
3+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_2,
4+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_3,
5+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_4,
6+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_5,
7+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_6,
8+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_10,
9+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_14,

‎lib/generated/canonical_aix_sysaix.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_0,
2-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_2,
3-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_4,
4-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_6,
5-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_8,
6-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_10,
7-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_12,
8-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_16,
9-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_aix_20,
1+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_0,
2+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_2,
3+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_4,
4+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_6,
5+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_8,
6+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_10,
7+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_12,
8+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_16,
9+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_aix_20,

‎lib/generated/canonical_dos.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_0,
2-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_4,
3-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_6,
4-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_9,
5-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_13,
6-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_14,
7-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_18,
8-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_22,
9-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_23,
10-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_27,
11-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_32,
12-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_36,
13-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_39,
14-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_43,
15-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_dos_48,
1+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_dos_0,
2+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_dos_4,
3+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_dos_6,
4+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_dos_9,
5+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_dos_13,
6+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_dos_14,
7+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_dos_18,
8+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_dos_22,
9+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_dos_23,
10+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_dos_27,
11+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_dos_32,
12+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_dos_36,
13+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_dos_39,
14+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_dos_43,
15+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_dos_48,

‎lib/generated/canonical_extra.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_extra_0,
2-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_extra_2,
3-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_extra_4,
4-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_extra_6,
5-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_extra_7,
6-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_extra_9,
7-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_extra_11,
1+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_extra_0,
2+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_extra_2,
3+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_extra_4,
4+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_extra_6,
5+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_extra_7,
6+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_extra_9,
7+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_extra_11,

‎lib/generated/canonical_osf1.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_osf1_0,
2-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_osf1_1,
1+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_osf1_0,
2+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_osf1_1,

‎lib/generated/canonical_osf1_sysosf1.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_osf1_0,
2-
(unsigned short)(long)&((struct stringpool2_t *)0)->stringpool_osf1_2,
1+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_osf1_0,
2+
(unsigned short)(size_t)(void*)&((struct stringpool2_t *)0)->stringpool_osf1_2,

0 commit comments

Comments
 (0)