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>
This commit is contained in:
parent
7c56e917e7
commit
7ce5241f0e
@ -81,6 +81,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 4 bytes */
|
/* A size is 4 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -72,6 +72,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
/* If __SIZE_TYPE__ is defined we define ssize_t based on size_t.
|
/* If __SIZE_TYPE__ is defined we define ssize_t based on size_t.
|
||||||
* We simply change "unsigned" to "signed" for this single definition
|
* We simply change "unsigned" to "signed" for this single definition
|
||||||
|
@ -73,6 +73,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A (near) size is 2 bytes */
|
/* A (near) size is 2 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -70,6 +70,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 4 bytes */
|
/* A size is 4 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -79,6 +79,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is two bytes */
|
/* A size is two bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -80,6 +80,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is two bytes */
|
/* A size is two bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -70,6 +70,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 4 bytes */
|
/* A size is 4 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -70,6 +70,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 4 bytes */
|
/* A size is 4 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -73,6 +73,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 4 bytes */
|
/* A size is 4 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -72,6 +72,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 2 bytes */
|
/* A size is 2 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -70,6 +70,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 4 bytes */
|
/* A size is 4 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -70,6 +70,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 4 bytes */
|
/* A size is 4 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -78,6 +78,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* Use uintreg_t for register-width integers */
|
/* Use uintreg_t for register-width integers */
|
||||||
|
|
||||||
#ifdef CONFIG_ARCH_RV32
|
#ifdef CONFIG_ARCH_RV32
|
||||||
|
@ -94,6 +94,18 @@ typedef unsigned short _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#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 defined(__SIZE_TYPE__)
|
||||||
/* If __SIZE_TYPE__ is defined we define ssize_t based on size_t.
|
/* If __SIZE_TYPE__ is defined we define ssize_t based on size_t.
|
||||||
* We simply change "unsigned" to "signed" for this single definition
|
* We simply change "unsigned" to "signed" for this single definition
|
||||||
|
@ -72,6 +72,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 4 bytes */
|
/* A size is 4 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -70,6 +70,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 4 bytes */
|
/* A size is 4 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -71,6 +71,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 4 bytes */
|
/* A size is 4 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -71,6 +71,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
/* If __SIZE_TYPE__ is defined we define ssize_t based on size_t.
|
/* If __SIZE_TYPE__ is defined we define ssize_t based on size_t.
|
||||||
* We simply change "unsigned" to "signed" for this single definition
|
* We simply change "unsigned" to "signed" for this single definition
|
||||||
|
@ -70,6 +70,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 4 bytes */
|
/* A size is 4 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -66,6 +66,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 4 bytes */
|
/* A size is 4 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -90,6 +90,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A pointer is 2 or 3 bytes, depending upon if the ez80 is in z80
|
/* A pointer is 2 or 3 bytes, depending upon if the ez80 is in z80
|
||||||
* compatibility mode or not
|
* compatibility mode or not
|
||||||
*
|
*
|
||||||
|
@ -78,6 +78,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 2 bytes */
|
/* A size is 2 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -82,6 +82,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 2 bytes */
|
/* A size is 2 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -78,6 +78,9 @@ typedef __WCHAR_TYPE__ _wchar_t;
|
|||||||
typedef int _wchar_t;
|
typedef int _wchar_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef int _wint_t;
|
||||||
|
typedef int _wctype_t;
|
||||||
|
|
||||||
/* A size is 2 bytes */
|
/* A size is 2 bytes */
|
||||||
|
|
||||||
#if defined(__SIZE_TYPE__)
|
#if defined(__SIZE_TYPE__)
|
||||||
|
@ -192,14 +192,14 @@ typedef _wchar_t wchar_t;
|
|||||||
* An integral type capable of storing any valid value of wchar_t, or WEOF.
|
* 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
|
/* wctype_t
|
||||||
* A scalar type of a data object that can hold values which represent
|
* A scalar type of a data object that can hold values which represent
|
||||||
* locale-specific character classification.
|
* locale-specific character classification.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
typedef int wctype_t;
|
typedef _wctype_t wctype_t;
|
||||||
|
|
||||||
#if defined(CONFIG_FS_LARGEFILE)
|
#if defined(CONFIG_FS_LARGEFILE)
|
||||||
/* Large file versions */
|
/* Large file versions */
|
||||||
|
Loading…
Reference in New Issue
Block a user