From 1897d97a374039be79f1d8f20a0fdadc0d588543 Mon Sep 17 00:00:00 2001 From: tijl Date: Tue, 15 Apr 2014 09:41:52 +0000 Subject: [PATCH] MFC r263998: Rename __wchar_t so it no longer conflicts with __wchar_t from clang 3.4 -fms-extensions. git-svn-id: svn://svn.freebsd.org/base/stable/10@264496 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- include/inttypes.h | 2 +- include/stddef.h | 2 +- include/stdlib.h | 2 +- include/wchar.h | 2 +- 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 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/inttypes.h b/include/inttypes.h index f702d2c3c..510939680 100644 --- a/include/inttypes.h +++ b/include/inttypes.h @@ -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 diff --git a/include/stddef.h b/include/stddef.h index ea88214f7..2c73a2e2d 100644 --- a/include/stddef.h +++ b/include/stddef.h @@ -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 diff --git a/include/stdlib.h b/include/stdlib.h index 93cf122b9..3ed07f398 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -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 diff --git a/include/wchar.h b/include/wchar.h index 4a3fe5385..8233bdff1 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -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 diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h index 7915d0b7c..e36699c55 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 2876648d6..572b9694f 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 ba0ee302a..a05f01c8d 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 55ec06173..2c5e27441 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 aa8a299a2..62e2fe9f0 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 b55d3888c..0a6ae4677 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 2d6bfbca2..816a30123 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 */ -- 2.45.0