d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename __wchar_t so it no longer conflicts with __wchar_t from clang 3.4

Browse Source 
-fms-extensions.

MFC after:	2 weeks
This commit is contained in:
tijl 2014-04-01 14:46:11 +00:00
parent 1281eaa27c
commit 606babe108
11 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/inttypes.h
View File

@ -34,7 +34,7 @@
#ifndef __cplusplus #ifndef __cplusplus
#ifndef _WCHAR_T_DECLARED #ifndef _WCHAR_T_DECLARED
typedef __wchar_t wchar_t; typedef ___wchar_t wchar_t;
#define _WCHAR_T_DECLARED #define _WCHAR_T_DECLARED
#endif #endif
#endif #endif

2
include/stddef.h
View File

@ -54,7 +54,7 @@ typedef __size_t size_t;
#ifndef __cplusplus #ifndef __cplusplus
#ifndef _WCHAR_T_DECLARED #ifndef _WCHAR_T_DECLARED
typedef __wchar_t wchar_t; typedef ___wchar_t wchar_t;
#define _WCHAR_T_DECLARED #define _WCHAR_T_DECLARED
#endif #endif
#endif #endif

2
include/stdlib.h
View File

@ -51,7 +51,7 @@ typedef __size_t size_t;
#ifndef __cplusplus #ifndef __cplusplus
#ifndef _WCHAR_T_DECLARED #ifndef _WCHAR_T_DECLARED
typedef __wchar_t wchar_t; typedef ___wchar_t wchar_t;
#define _WCHAR_T_DECLARED #define _WCHAR_T_DECLARED
#endif #endif
#endif #endif

2
include/wchar.h
View File

@ -78,7 +78,7 @@ typedef __size_t size_t;
#ifndef __cplusplus #ifndef __cplusplus
#ifndef _WCHAR_T_DECLARED #ifndef _WCHAR_T_DECLARED
typedef __wchar_t wchar_t; typedef ___wchar_t wchar_t;
#define _WCHAR_T_DECLARED #define _WCHAR_T_DECLARED
#endif #endif
#endif #endif

4
sys/arm/include/_types.h
View File

@ -106,11 +106,11 @@ typedef __uint64_t __vm_pindex_t;
typedef __uint32_t __vm_size_t; typedef __uint32_t __vm_size_t;
#ifdef __ARM_EABI__ #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_MIN 0 /* min value for a wchar_t */
#define __WCHAR_MAX __UINT_MAX /* max value for a wchar_t */ #define __WCHAR_MAX __UINT_MAX /* max value for a wchar_t */
#else #else
typedef int __wchar_t; typedef int ___wchar_t;
#define __WCHAR_MIN __INT_MIN /* min value for a wchar_t */ #define __WCHAR_MIN __INT_MIN /* min value for a wchar_t */
#define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */ #define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */
#endif #endif

2
sys/ia64/include/_types.h
View File

@ -96,7 +96,7 @@ typedef __int64_t __vm_ooffset_t;
typedef __uint64_t __vm_paddr_t; typedef __uint64_t __vm_paddr_t;
typedef __uint64_t __vm_pindex_t; typedef __uint64_t __vm_pindex_t;
typedef __uint64_t __vm_size_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_MIN __INT_MIN /* min value for a wchar_t */
#define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */ #define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */

2
sys/mips/include/_types.h
View File

@ -145,7 +145,7 @@ typedef __uint32_t __vm_paddr_t;
typedef __int64_t __vm_ooffset_t; typedef __int64_t __vm_ooffset_t;
typedef __uint64_t __vm_pindex_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_MIN __INT_MIN /* min value for a wchar_t */
#define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */ #define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */

2
sys/powerpc/include/_types.h
View File

@ -133,7 +133,7 @@ typedef __uint32_t __vm_size_t;
#endif #endif
typedef __int64_t __vm_ooffset_t; typedef __int64_t __vm_ooffset_t;
typedef __uint64_t __vm_pindex_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_MIN __INT_MIN /* min value for a wchar_t */
#define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */ #define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */

2
sys/sparc64/include/_types.h
View File

@ -92,7 +92,7 @@ typedef __int64_t __vm_ooffset_t;
typedef __uint64_t __vm_paddr_t; typedef __uint64_t __vm_paddr_t;
typedef __uint64_t __vm_pindex_t; typedef __uint64_t __vm_pindex_t;
typedef __uint64_t __vm_size_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_MIN __INT_MIN /* min value for a wchar_t */
#define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */ #define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */

2
sys/sys/stdatomic.h
View File

@ -198,7 +198,7 @@ typedef _Atomic(long long) atomic_llong;
typedef _Atomic(unsigned long long) atomic_ullong; typedef _Atomic(unsigned long long) atomic_ullong;
typedef _Atomic(__char16_t) atomic_char16_t; typedef _Atomic(__char16_t) atomic_char16_t;
typedef _Atomic(__char32_t) atomic_char32_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(__int_least8_t) atomic_int_least8_t;
typedef _Atomic(__uint_least8_t) atomic_uint_least8_t; typedef _Atomic(__uint_least8_t) atomic_uint_least8_t;
typedef _Atomic(__int_least16_t) atomic_int_least16_t; typedef _Atomic(__int_least16_t) atomic_int_least16_t;

2
sys/x86/include/_types.h
View File

@ -142,7 +142,7 @@ typedef __uint32_t __vm_size_t;
#endif #endif
typedef __int64_t __vm_ooffset_t; typedef __int64_t __vm_ooffset_t;
typedef __uint64_t __vm_pindex_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_MIN __INT_MIN /* min value for a wchar_t */
#define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */ #define __WCHAR_MAX __INT_MAX /* max value for a wchar_t */