From e8ab551e5fb0c3b4da36ce4cd1879d73dd2cdf26 Mon Sep 17 00:00:00 2001 From: tijl Date: Tue, 15 Apr 2014 09:41:52 +0000 Subject: MFC r263998: Rename __wchar_t so it no longer conflicts with __wchar_t from clang 3.4 -fms-extensions. --- include/inttypes.h | 2 +- include/stddef.h | 2 +- include/stdlib.h | 2 +- include/wchar.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/inttypes.h b/include/inttypes.h index f702d2c..5109396 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 ea88214..2c73a2e 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 93cf122..3ed07f3 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 4a3fe53..8233bdf 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 -- cgit v1.1