types.h: fix windows build error

Windows Kits\10\Include\10.0.22621.0\ucrt\corecrt.h(605,39): error C2371: 'wint_t': redefinition; different basic types Windows Kits\10\Include\10.0.22621.0\ucrt\corecrt.h(606,39): error C2371: 'wctype_t': redefinition; different basic types Co-authored-by: chenxiaoyi <chenxiaoyi@xiaomi.com> Co-authored-by: xuxin19 <xuxin19@xiaomi.com>
2024-06-13 11:49:24 +08:00 · 2024-06-13 11:49:24 +08:00 · 7ce5241f0e
commit 7ce5241f0e
parent 7c56e917e7
25 changed files with 83 additions and 2 deletions
--- a/arch/arm/include/types.h
+++ b/arch/arm/include/types.h
@ -81,6 +81,9 @@ typedef __WCHAR_TYPE__          _wchar_t;
 typedef int                     _wchar_t;
 #endif

+typedef int                     _wint_t;
+typedef int                     _wctype_t;
+
 /* A size is 4 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/arm64/include/types.h
+++ b/arch/arm64/include/types.h
@ -72,6 +72,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 #if defined(__SIZE_TYPE__)
 /* If __SIZE_TYPE__ is defined we define ssize_t based on size_t.
 * We simply change "unsigned" to "signed" for this single definition
--- a/arch/avr/include/avr/types.h
+++ b/arch/avr/include/avr/types.h
@ -73,6 +73,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A (near) size is 2 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/avr/include/avr32/types.h
+++ b/arch/avr/include/avr32/types.h
@ -70,6 +70,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is 4 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/hc/include/hc12/types.h
+++ b/arch/hc/include/hc12/types.h
@ -79,6 +79,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is two bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/hc/include/hcs12/types.h
+++ b/arch/hc/include/hcs12/types.h
@ -80,6 +80,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is two bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/mips/include/types.h
+++ b/arch/mips/include/types.h
@ -70,6 +70,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is 4 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/misoc/include/types.h
+++ b/arch/misoc/include/types.h
@ -70,6 +70,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is 4 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/or1k/include/types.h
+++ b/arch/or1k/include/types.h
@ -73,6 +73,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is 4 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/renesas/include/m16c/types.h
+++ b/arch/renesas/include/m16c/types.h
@ -72,6 +72,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is 2 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/renesas/include/rx65n/types.h
+++ b/arch/renesas/include/rx65n/types.h
@ -70,6 +70,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is 4 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/renesas/include/sh1/types.h
+++ b/arch/renesas/include/sh1/types.h
@ -70,6 +70,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is 4 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/risc-v/include/types.h
+++ b/arch/risc-v/include/types.h
@ -78,6 +78,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* Use uintreg_t for register-width integers */

 #ifdef CONFIG_ARCH_RV32
--- a/arch/sim/include/types.h
+++ b/arch/sim/include/types.h
@ -94,6 +94,18 @@ typedef unsigned short     _wchar_t;
 typedef int                _wchar_t;
 #endif

+#ifdef _MSC_VER
+typedef unsigned short     _wint_t;
+#else
+typedef int                _wint_t;
+#endif
+
+#ifdef _MSC_VER
+typedef unsigned short     _wctype_t;
+#else
+typedef int                _wctype_t;
+#endif
+
 #if defined(__SIZE_TYPE__)
 /* If __SIZE_TYPE__ is defined we define ssize_t based on size_t.
 * We simply change "unsigned" to "signed" for this single definition
--- a/arch/sparc/include/types.h
+++ b/arch/sparc/include/types.h
@ -72,6 +72,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is 4 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/tricore/include/types.h
+++ b/arch/tricore/include/types.h
@ -70,6 +70,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is 4 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/x86/include/i486/types.h
+++ b/arch/x86/include/i486/types.h
@ -71,6 +71,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is 4 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/x86_64/include/intel64/types.h
+++ b/arch/x86_64/include/intel64/types.h
@ -71,6 +71,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 #if defined(__SIZE_TYPE__)
 /* If __SIZE_TYPE__ is defined we define ssize_t based on size_t.
 * We simply change "unsigned" to "signed" for this single definition
--- a/arch/xtensa/include/types.h
+++ b/arch/xtensa/include/types.h
@ -70,6 +70,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is 4 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/z16/include/types.h
+++ b/arch/z16/include/types.h
@ -66,6 +66,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is 4 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/z80/include/ez80/types.h
+++ b/arch/z80/include/ez80/types.h
@ -90,6 +90,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A pointer is 2 or 3 bytes, depending upon if the ez80 is in z80
 * compatibility mode or not
 *
--- a/arch/z80/include/z180/types.h
+++ b/arch/z80/include/z180/types.h
@ -78,6 +78,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is 2 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/z80/include/z8/types.h
+++ b/arch/z80/include/z8/types.h
@ -82,6 +82,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is 2 bytes */

 #if defined(__SIZE_TYPE__)
--- a/arch/z80/include/z80/types.h
+++ b/arch/z80/include/z80/types.h
@ -78,6 +78,9 @@ typedef __WCHAR_TYPE__     _wchar_t;
 typedef int                _wchar_t;
 #endif

+typedef int                _wint_t;
+typedef int                _wctype_t;
+
 /* A size is 2 bytes */

 #if defined(__SIZE_TYPE__)
--- a/include/sys/types.h
+++ b/include/sys/types.h
@ -192,14 +192,14 @@ typedef _wchar_t     wchar_t;
 *   An integral type capable of storing any valid value of wchar_t, or WEOF.
 */

-typedef int wint_t;
+typedef _wint_t wint_t;

 /* wctype_t
 *   A scalar type of a data object that can hold values which represent
 *   locale-specific character classification.
 */

-typedef int wctype_t;
+typedef _wctype_t wctype_t;

 #if defined(CONFIG_FS_LARGEFILE)
 /* Large file versions */