svn commit: r263998 - in head: include sys/arm/include sys/ia64/include sys/mips/include sys/powerpc/include sys/sparc64/include sys/sys sys/x86/include
Tijl Coosemans
tijl at FreeBSD.org
Tue Apr 1 14:46:13 UTC 2014
Author: tijl
Date: Tue Apr 1 14:46:11 2014
New Revision: 263998
URL: http://svnweb.freebsd.org/changeset/base/263998
Log:
Rename __wchar_t so it no longer conflicts with __wchar_t from clang 3.4
-fms-extensions.
MFC after: 2 weeks
Modified:
head/include/inttypes.h
head/include/stddef.h
head/include/stdlib.h
head/include/wchar.h
head/sys/arm/include/_types.h
head/sys/ia64/include/_types.h
head/sys/mips/include/_types.h
head/sys/powerpc/include/_types.h
head/sys/sparc64/include/_types.h
head/sys/sys/stdatomic.h
head/sys/x86/include/_types.h
Modified: head/include/inttypes.h
==============================================================================
--- head/include/inttypes.h Tue Apr 1 14:24:32 2014 (r263997)
+++ head/include/inttypes.h Tue Apr 1 14:46:11 2014 (r263998)
@@ -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: head/include/stddef.h
==============================================================================
--- head/include/stddef.h Tue Apr 1 14:24:32 2014 (r263997)
+++ head/include/stddef.h Tue Apr 1 14:46:11 2014 (r263998)
@@ -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: head/include/stdlib.h
==============================================================================
--- head/include/stdlib.h Tue Apr 1 14:24:32 2014 (r263997)
+++ head/include/stdlib.h Tue Apr 1 14:46:11 2014 (r263998)
@@ -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: head/include/wchar.h
==============================================================================
--- head/include/wchar.h Tue Apr 1 14:24:32 2014 (r263997)
+++ head/include/wchar.h Tue Apr 1 14:46:11 2014 (r263998)
@@ -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: head/sys/arm/include/_types.h
==============================================================================
--- head/sys/arm/include/_types.h Tue Apr 1 14:24:32 2014 (r263997)
+++ head/sys/arm/include/_types.h Tue Apr 1 14:46:11 2014 (r263998)
@@ -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: head/sys/ia64/include/_types.h
==============================================================================
--- head/sys/ia64/include/_types.h Tue Apr 1 14:24:32 2014 (r263997)
+++ head/sys/ia64/include/_types.h Tue Apr 1 14:46:11 2014 (r263998)
@@ -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: head/sys/mips/include/_types.h
==============================================================================
--- head/sys/mips/include/_types.h Tue Apr 1 14:24:32 2014 (r263997)
+++ head/sys/mips/include/_types.h Tue Apr 1 14:46:11 2014 (r263998)
@@ -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: head/sys/powerpc/include/_types.h
==============================================================================
--- head/sys/powerpc/include/_types.h Tue Apr 1 14:24:32 2014 (r263997)
+++ head/sys/powerpc/include/_types.h Tue Apr 1 14:46:11 2014 (r263998)
@@ -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: head/sys/sparc64/include/_types.h
==============================================================================
--- head/sys/sparc64/include/_types.h Tue Apr 1 14:24:32 2014 (r263997)
+++ head/sys/sparc64/include/_types.h Tue Apr 1 14:46:11 2014 (r263998)
@@ -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: head/sys/sys/stdatomic.h
==============================================================================
--- head/sys/sys/stdatomic.h Tue Apr 1 14:24:32 2014 (r263997)
+++ head/sys/sys/stdatomic.h Tue Apr 1 14:46:11 2014 (r263998)
@@ -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: head/sys/x86/include/_types.h
==============================================================================
--- head/sys/x86/include/_types.h Tue Apr 1 14:24:32 2014 (r263997)
+++ head/sys/x86/include/_types.h Tue Apr 1 14:46:11 2014 (r263998)
@@ -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 */
More information about the svn-src-head
mailing list