summaryrefslogtreecommitdiff
path: root/arch/i386
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-10-15 00:28:49 -0400
committerRich Felker <dalias@aerifal.cx>2011-10-15 00:28:49 -0400
commit1d3c2768078937eeb2d4d265e34f7e549ccda5f1 (patch)
treeb08ef3f00f96e1c9db2c9379208bc179ff8268e9 /arch/i386
parent2bb75db611f1ce534073be20e5834cc75a7c531c (diff)
downloadmusl-1d3c2768078937eeb2d4d265e34f7e549ccda5f1.tar.gz
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.
Diffstat (limited to 'arch/i386')
-rwxr-xr-xarch/i386/bits/alltypes.h.sh2
1 files changed, 2 insertions, 0 deletions
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;