Follow @Openwall on Twitter for new release announcements and other news
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Mon, 10 Oct 2011 12:33:20 +0200
From: Arvid Picciani <aep@...s.org>
To: <musl@...ts.openwall.com>
Subject: [PATCH] In C++ wchar_t is a keyword, so don't define it

---
 arch/i386/bits/alltypes.h.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/i386/bits/alltypes.h.sh b/arch/i386/bits/alltypes.h.sh
index 672d6a4..48d6efc 100755
--- a/arch/i386/bits/alltypes.h.sh
+++ b/arch/i386/bits/alltypes.h.sh
@@ -26,7 +26,7 @@ TYPEDEF __builtin_va_list va_list;
 TYPEDEF struct __va_list * va_list;
 #endif
 
-#ifdef __WCHAR_TYPE__
+#if defined(__WCHAR_TYPE__) && !defined(__cplusplus)
 TYPEDEF __WCHAR_TYPE__ wchar_t;
 #else
 TYPEDEF long wchar_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.