Date: Tue, 15 Apr 2014 09:41:52 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r264496 - in stable/10: include sys/arm/include sys/ia64/include sys/mips/include sys/powerpc/include sys/sparc64/include sys/sys sys/x86/include Message-ID: <201404150941.s3F9fqv4052392@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Tue Apr 15 09:41:52 2014 New Revision: 264496 URL: http://svnweb.freebsd.org/changeset/base/264496 Log: MFC r263998: Rename __wchar_t so it no longer conflicts with __wchar_t from clang 3.4 -fms-extensions. Modified: stable/10/include/inttypes.h stable/10/include/stddef.h stable/10/include/stdlib.h stable/10/include/wchar.h stable/10/sys/arm/include/_types.h stable/10/sys/ia64/include/_types.h stable/10/sys/mips/include/_types.h stable/10/sys/powerpc/include/_types.h stable/10/sys/sparc64/include/_types.h stable/10/sys/sys/stdatomic.h stable/10/sys/x86/include/_types.h Directory Properties: stable/10/ (props changed) Modified: stable/10/include/inttypes.h ============================================================================== --- stable/10/include/inttypes.h Tue Apr 15 09:40:45 2014 (r264495) +++ stable/10/include/inttypes.h Tue Apr 15 09:41:52 2014 (r264496) @@ -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 Modified: stable/10/include/stddef.h ============================================================================== --- stable/10/include/stddef.h Tue Apr 15 09:40:45 2014 (r264495) +++ stable/10/include/stddef.h Tue Apr 15 09:41:52 2014 (r264496) @@ -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 Modified: stable/10/include/stdlib.h ============================================================================== --- stable/10/include/stdlib.h Tue Apr 15 09:40:45 2014 (r264495) +++ stable/10/include/stdlib.h Tue Apr 15 09:41:52 2014 (r264496) @@ -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 Modified: stable/10/include/wchar.h ============================================================================== --- stable/10/include/wchar.h Tue Apr 15 09:40:45 2014 (r264495) +++ stable/10/include/wchar.h Tue Apr 15 09:41:52 2014 (r264496) @@ -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 Modified: stable/10/sys/arm/include/_types.h ============================================================================== --- stable/10/sys/arm/include/_types.h Tue Apr 15 09:40:45 2014 (r264495) +++ stable/10/sys/arm/include/_types.h Tue Apr 15 09:41:52 2014 (r264496) @@ -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 Modified: stable/10/sys/ia64/include/_types.h ============================================================================== --- stable/10/sys/ia64/include/_types.h Tue Apr 15 09:40:45 2014 (r264495) +++ stable/10/sys/ia64/include/_types.h Tue Apr 15 09:41:52 2014 (r264496) @@ -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 */ Modified: stable/10/sys/mips/include/_types.h ============================================================================== --- stable/10/sys/mips/include/_types.h Tue Apr 15 09:40:45 2014 (r264495) +++ stable/10/sys/mips/include/_types.h Tue Apr 15 09:41:52 2014 (r264496) @@ -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 */ Modified: stable/10/sys/powerpc/include/_types.h ============================================================================== --- stable/10/sys/powerpc/include/_types.h Tue Apr 15 09:40:45 2014 (r264495) +++ stable/10/sys/powerpc/include/_types.h Tue Apr 15 09:41:52 2014 (r264496) @@ -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 */ Modified: stable/10/sys/sparc64/include/_types.h ============================================================================== --- stable/10/sys/sparc64/include/_types.h Tue Apr 15 09:40:45 2014 (r264495) +++ stable/10/sys/sparc64/include/_types.h Tue Apr 15 09:41:52 2014 (r264496) @@ -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 */ Modified: stable/10/sys/sys/stdatomic.h ============================================================================== --- stable/10/sys/sys/stdatomic.h Tue Apr 15 09:40:45 2014 (r264495) +++ stable/10/sys/sys/stdatomic.h Tue Apr 15 09:41:52 2014 (r264496) @@ -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; Modified: stable/10/sys/x86/include/_types.h ============================================================================== --- stable/10/sys/x86/include/_types.h Tue Apr 15 09:40:45 2014 (r264495) +++ stable/10/sys/x86/include/_types.h Tue Apr 15 09:41:52 2014 (r264496) @@ -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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404150941.s3F9fqv4052392>