diff options
author | tijl <tijl@FreeBSD.org> | 2014-04-15 09:41:52 +0000 |
---|---|---|
committer | tijl <tijl@FreeBSD.org> | 2014-04-15 09:41:52 +0000 |
commit | e8ab551e5fb0c3b4da36ce4cd1879d73dd2cdf26 (patch) | |
tree | 53df10bbed0e4e1c4e7b36a18c14a582197c6a4b /sys | |
parent | 7d93aa7db1e12ce3fc0d5aca0245219d7a8a8d9d (diff) | |
download | FreeBSD-src-e8ab551e5fb0c3b4da36ce4cd1879d73dd2cdf26.zip FreeBSD-src-e8ab551e5fb0c3b4da36ce4cd1879d73dd2cdf26.tar.gz |
MFC r263998:
Rename __wchar_t so it no longer conflicts with __wchar_t from clang 3.4
-fms-extensions.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/arm/include/_types.h | 4 | ||||
-rw-r--r-- | sys/ia64/include/_types.h | 2 | ||||
-rw-r--r-- | sys/mips/include/_types.h | 2 | ||||
-rw-r--r-- | sys/powerpc/include/_types.h | 2 | ||||
-rw-r--r-- | sys/sparc64/include/_types.h | 2 | ||||
-rw-r--r-- | sys/sys/stdatomic.h | 2 | ||||
-rw-r--r-- | sys/x86/include/_types.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h index 7915d0b..e36699c 100644 --- a/sys/arm/include/_types.h +++ b/sys/arm/include/_types.h @@ -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 diff --git a/sys/ia64/include/_types.h b/sys/ia64/include/_types.h index 2876648..572b969 100644 --- a/sys/ia64/include/_types.h +++ b/sys/ia64/include/_types.h @@ -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 */ diff --git a/sys/mips/include/_types.h b/sys/mips/include/_types.h index ba0ee30..a05f01c 100644 --- a/sys/mips/include/_types.h +++ b/sys/mips/include/_types.h @@ -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 */ diff --git a/sys/powerpc/include/_types.h b/sys/powerpc/include/_types.h index 55ec061..2c5e274 100644 --- a/sys/powerpc/include/_types.h +++ b/sys/powerpc/include/_types.h @@ -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 */ diff --git a/sys/sparc64/include/_types.h b/sys/sparc64/include/_types.h index aa8a299..62e2fe9 100644 --- a/sys/sparc64/include/_types.h +++ b/sys/sparc64/include/_types.h @@ -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 */ diff --git a/sys/sys/stdatomic.h b/sys/sys/stdatomic.h index b55d388..0a6ae46 100644 --- a/sys/sys/stdatomic.h +++ b/sys/sys/stdatomic.h @@ -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; diff --git a/sys/x86/include/_types.h b/sys/x86/include/_types.h index 2d6bfbc..816a301 100644 --- a/sys/x86/include/_types.h +++ b/sys/x86/include/_types.h @@ -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 */ |