|
Message-Id: <1318261112.967468.21866@legion> Date: Mon, 10 Oct 2011 12:33:20 +0200 From: Arvid Picciani <aep@...s.org> To: <musl@...ts.openwall.com> Subject: [PATCH 1/2] In C++ wchar_t is a keyword, so don't define it --- arch/i386/bits/alltypes.h.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/i386/bits/alltypes.h.sh b/arch/i386/bits/alltypes.h.sh index 672d6a4..5aacc29 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; -- 1.7.7
Powered by blists - more mailing lists
Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.