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/i386/bits/alltypes.h.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/i386/bits') diff --git a/arch/i386/bits/alltypes.h.sh b/arch/i386/bits/alltypes.h.sh index 672d6a45..5aacc293 100755 --- a/arch/i386/bits/alltypes.h.sh +++ b/arch/i386/bits/alltypes.h.sh @@ -26,11 +26,13 @@ TYPEDEF __builtin_va_list va_list; TYPEDEF struct __va_list * va_list; #endif +#ifndef __cplusplus #ifdef __WCHAR_TYPE__ TYPEDEF __WCHAR_TYPE__ wchar_t; #else TYPEDEF long wchar_t; #endif +#endif TYPEDEF long wint_t; TYPEDEF long wctrans_t; TYPEDEF long wctype_t; -- cgit 1.4.1