Author: tijl Date: Tue Apr 15 09:40:45 2014 New Revision: 264495 URL: http://svnweb.freebsd.org/changeset/base/264495
Log: MFC r263998: Rename __wchar_t so it no longer conflicts with __wchar_t from clang 3.4 -fms-extensions. Modified: stable/9/include/inttypes.h stable/9/include/stdatomic.h stable/9/include/stddef.h stable/9/include/stdlib.h stable/9/include/wchar.h stable/9/sys/sys/_types.h Directory Properties: stable/9/ (props changed) stable/9/include/ (props changed) stable/9/sys/ (props changed) stable/9/sys/sys/ (props changed) Modified: stable/9/include/inttypes.h ============================================================================== --- stable/9/include/inttypes.h Tue Apr 15 09:10:01 2014 (r264494) +++ stable/9/include/inttypes.h Tue Apr 15 09:40:45 2014 (r264495) @@ -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/9/include/stdatomic.h ============================================================================== --- stable/9/include/stdatomic.h Tue Apr 15 09:10:01 2014 (r264494) +++ stable/9/include/stdatomic.h Tue Apr 15 09:40:45 2014 (r264495) @@ -149,7 +149,7 @@ typedef _Atomic(unsigned long long) atom typedef _Atomic(__char16_t) atomic_char16_t; typedef _Atomic(__char32_t) atomic_char32_t; #endif -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/9/include/stddef.h ============================================================================== --- stable/9/include/stddef.h Tue Apr 15 09:10:01 2014 (r264494) +++ stable/9/include/stddef.h Tue Apr 15 09:40:45 2014 (r264495) @@ -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/9/include/stdlib.h ============================================================================== --- stable/9/include/stdlib.h Tue Apr 15 09:10:01 2014 (r264494) +++ stable/9/include/stdlib.h Tue Apr 15 09:40:45 2014 (r264495) @@ -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/9/include/wchar.h ============================================================================== --- stable/9/include/wchar.h Tue Apr 15 09:10:01 2014 (r264494) +++ stable/9/include/wchar.h Tue Apr 15 09:40:45 2014 (r264495) @@ -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/9/sys/sys/_types.h ============================================================================== --- stable/9/sys/sys/_types.h Tue Apr 15 09:10:01 2014 (r264494) +++ stable/9/sys/sys/_types.h Tue Apr 15 09:40:45 2014 (r264495) @@ -87,7 +87,7 @@ typedef int __cpusetid_t; /* cpuset ide */ typedef int __ct_rune_t; /* arg type for ctype funcs */ typedef __ct_rune_t __rune_t; /* rune_t (see above) */ -typedef __ct_rune_t __wchar_t; /* wchar_t (see above) */ +typedef __ct_rune_t ___wchar_t; /* wchar_t (see above) */ typedef __ct_rune_t __wint_t; /* wint_t (see above) */ typedef __uint32_t __dev_t; /* device number */ _______________________________________________ svn-src-stable-9@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9 To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
