Rename __wchar_t so it no longer conflicts with __wchar_t from clang 3.4
-fms-extensions. MFC after: 2 weeks
This commit is contained in:
parent
1281eaa27c
commit
606babe108
@ -34,7 +34,7 @@
|
||||
|
||||
#ifndef __cplusplus
|
||||
#ifndef _WCHAR_T_DECLARED
|
||||
typedef __wchar_t wchar_t;
|
||||
typedef ___wchar_t wchar_t;
|
||||
#define _WCHAR_T_DECLARED
|
||||
#endif
|
||||
#endif
|
||||
|
@ -54,7 +54,7 @@ typedef __size_t size_t;
|
||||
|
||||
#ifndef __cplusplus
|
||||
#ifndef _WCHAR_T_DECLARED
|
||||
typedef __wchar_t wchar_t;
|
||||
typedef ___wchar_t wchar_t;
|
||||
#define _WCHAR_T_DECLARED
|
||||
#endif
|
||||
#endif
|
||||
|
@ -51,7 +51,7 @@ typedef __size_t size_t;
|
||||
|
||||
#ifndef __cplusplus
|
||||
#ifndef _WCHAR_T_DECLARED
|
||||
typedef __wchar_t wchar_t;
|
||||
typedef ___wchar_t wchar_t;
|
||||
#define _WCHAR_T_DECLARED
|
||||
#endif
|
||||
#endif
|
||||
|
@ -78,7 +78,7 @@ typedef __size_t size_t;
|
||||
|
||||
#ifndef __cplusplus
|
||||
#ifndef _WCHAR_T_DECLARED
|
||||
typedef __wchar_t wchar_t;
|
||||
typedef ___wchar_t wchar_t;
|
||||
#define _WCHAR_T_DECLARED
|
||||
#endif
|
||||
#endif
|
||||
|
@ -106,11 +106,11 @@ typedef __uint64_t __vm_pindex_t;
|
||||
typedef __uint32_t __vm_size_t;
|
||||
|
||||
#ifdef __ARM_EABI__
|
||||
typedef unsigned int __wchar_t;
|
||||
typedef unsigned int ___wchar_t;
|
||||
#define __WCHAR_MIN 0 /* min value for a wchar_t */
|
||||
#define __WCHAR_MAX __UINT_MAX /* max value for a wchar_t */
|
||||
#else
|
||||
typedef int __wchar_t;
|
||||
typedef int ___wchar_t;
|
||||
#define __WCHAR_MIN __INT_MIN /* min value for a wchar_t */
|
||||
#define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */
|
||||
#endif
|
||||
|
@ -96,7 +96,7 @@ typedef __int64_t __vm_ooffset_t;
|
||||
typedef __uint64_t __vm_paddr_t;
|
||||
typedef __uint64_t __vm_pindex_t;
|
||||
typedef __uint64_t __vm_size_t;
|
||||
typedef int __wchar_t;
|
||||
typedef int ___wchar_t;
|
||||
|
||||
#define __WCHAR_MIN __INT_MIN /* min value for a wchar_t */
|
||||
#define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */
|
||||
|
@ -145,7 +145,7 @@ typedef __uint32_t __vm_paddr_t;
|
||||
|
||||
typedef __int64_t __vm_ooffset_t;
|
||||
typedef __uint64_t __vm_pindex_t;
|
||||
typedef int __wchar_t;
|
||||
typedef int ___wchar_t;
|
||||
|
||||
#define __WCHAR_MIN __INT_MIN /* min value for a wchar_t */
|
||||
#define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */
|
||||
|
@ -133,7 +133,7 @@ typedef __uint32_t __vm_size_t;
|
||||
#endif
|
||||
typedef __int64_t __vm_ooffset_t;
|
||||
typedef __uint64_t __vm_pindex_t;
|
||||
typedef int __wchar_t;
|
||||
typedef int ___wchar_t;
|
||||
|
||||
#define __WCHAR_MIN __INT_MIN /* min value for a wchar_t */
|
||||
#define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */
|
||||
|
@ -92,7 +92,7 @@ typedef __int64_t __vm_ooffset_t;
|
||||
typedef __uint64_t __vm_paddr_t;
|
||||
typedef __uint64_t __vm_pindex_t;
|
||||
typedef __uint64_t __vm_size_t;
|
||||
typedef int __wchar_t;
|
||||
typedef int ___wchar_t;
|
||||
|
||||
#define __WCHAR_MIN __INT_MIN /* min value for a wchar_t */
|
||||
#define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */
|
||||
|
@ -198,7 +198,7 @@ typedef _Atomic(long long) atomic_llong;
|
||||
typedef _Atomic(unsigned long long) atomic_ullong;
|
||||
typedef _Atomic(__char16_t) atomic_char16_t;
|
||||
typedef _Atomic(__char32_t) atomic_char32_t;
|
||||
typedef _Atomic(__wchar_t) atomic_wchar_t;
|
||||
typedef _Atomic(___wchar_t) atomic_wchar_t;
|
||||
typedef _Atomic(__int_least8_t) atomic_int_least8_t;
|
||||
typedef _Atomic(__uint_least8_t) atomic_uint_least8_t;
|
||||
typedef _Atomic(__int_least16_t) atomic_int_least16_t;
|
||||
|
@ -142,7 +142,7 @@ typedef __uint32_t __vm_size_t;
|
||||
#endif
|
||||
typedef __int64_t __vm_ooffset_t;
|
||||
typedef __uint64_t __vm_pindex_t;
|
||||
typedef int __wchar_t;
|
||||
typedef int ___wchar_t;
|
||||
|
||||
#define __WCHAR_MIN __INT_MIN /* min value for a wchar_t */
|
||||
#define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */
|
||||
|
Loading…
Reference in New Issue
Block a user