From 1d3c2768078937eeb2d4d265e34f7e549ccda5f1 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 15 Oct 2011 00:28:49 -0400 Subject: don't define wchar_t on c++ it's a keyword in c++ (wtf). i'm not sure this is the cleanest solution; it might be better to avoid ever defining __NEED_wchar_t on c++. but in any case, this works for now. --- arch/x86_64/bits/alltypes.h.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/x86_64') diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh index 19843bd3..10fc3d52 100755 --- a/arch/x86_64/bits/alltypes.h.sh +++ b/arch/x86_64/bits/alltypes.h.sh @@ -21,7 +21,9 @@ TYPEDEF long ssize_t; TYPEDEF long ptrdiff_t; TYPEDEF __builtin_va_list va_list; +#ifndef __cplusplus TYPEDEF int wchar_t; +#endif TYPEDEF int wint_t; TYPEDEF int wctrans_t; TYPEDEF int wctype_t; -- cgit v1.2.1