diff options
| author | tijl <tijl@FreeBSD.org> | 2014-04-01 14:46:11 +0000 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2014-04-01 14:46:11 +0000 |
| commit | 606babe108ad1fb18da094dfc97340d01e6c7195 (patch) | |
| tree | c38d33f19610352734b52f47a0dc5f6af1d13021 /include | |
| parent | 1281eaa27c8e8a31c09ac3307f0cc77fd884aa1e (diff) | |
| download | FreeBSD-src-606babe108ad1fb18da094dfc97340d01e6c7195.zip FreeBSD-src-606babe108ad1fb18da094dfc97340d01e6c7195.tar.gz | |
Rename __wchar_t so it no longer conflicts with __wchar_t from clang 3.4
-fms-extensions.
MFC after: 2 weeks
Diffstat (limited to 'include')
| -rw-r--r-- | include/inttypes.h | 2 | ||||
| -rw-r--r-- | include/stddef.h | 2 | ||||
| -rw-r--r-- | include/stdlib.h | 2 | ||||
| -rw-r--r-- | include/wchar.h | 2 |
4 files changed, 4 insertions, 4 deletions
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 |
