From 0a4c54d6060ab057c86d65be24cf6032e7436670 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Tue, 1 Apr 2014 14:46:11 +0000 Subject: Rename __wchar_t so it no longer conflicts with __wchar_t from clang 3.4 -fms-extensions. MFC after: 2 weeks --- sys/arm/include/_types.h | 4 ++-- sys/ia64/include/_types.h | 2 +- sys/mips/include/_types.h | 2 +- sys/powerpc/include/_types.h | 2 +- sys/sparc64/include/_types.h | 2 +- sys/sys/stdatomic.h | 2 +- sys/x86/include/_types.h | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'sys') diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h index 7915d0b7cafd..e36699c553db 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 2876648d6674..572b9694f2ce 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 ba0ee302aec2..a05f01c8d7ff 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 55ec0617318a..2c5e27441b62 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 aa8a299a2f81..62e2fe9f0adb 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 b55d3888c261..0a6ae4677bdd 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 2d6bfbca2bb7..816a30123270 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 */ -- cgit v1.2.3