From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/499 Path: news.gmane.org!not-for-mail From: Arvid Ephraim Picciani Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH] In C++ wchar_t is a keyword, so don't define it Date: Mon, 10 Oct 2011 12:33:20 +0200 Message-ID: <1318256855.346632.12255@legion> References: <1318246806.765170.9741@legion> <20111010122312.GS24939@port70.net> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1318268347 18847 80.91.229.12 (10 Oct 2011 17:39:07 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 10 Oct 2011 17:39:07 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-500-gllmg-musl=m.gmane.org@lists.openwall.com Mon Oct 10 19:39:04 2011 Return-path: Envelope-to: gllmg-musl@lo.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by lo.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1RDJod-0003q0-MD for gllmg-musl@lo.gmane.org; Mon, 10 Oct 2011 19:39:03 +0200 Original-Received: (qmail 8060 invoked by uid 550); 10 Oct 2011 17:39:02 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 25796 invoked from network); 10 Oct 2011 14:32:43 -0000 Xref: news.gmane.org gmane.linux.lib.musl.general:499 Archived-At: --- 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