diff options
| author | Rich Felker <dalias@aerifal.cx> | 2011-10-15 00:28:49 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2011-10-15 00:28:49 -0400 |
| commit | 1d3c2768078937eeb2d4d265e34f7e549ccda5f1 (patch) | |
| tree | b08ef3f00f96e1c9db2c9379208bc179ff8268e9 /arch | |
| parent | 2bb75db611f1ce534073be20e5834cc75a7c531c (diff) | |
| download | musl-1d3c2768078937eeb2d4d265e34f7e549ccda5f1.tar.gz musl-1d3c2768078937eeb2d4d265e34f7e549ccda5f1.tar.xz musl-1d3c2768078937eeb2d4d265e34f7e549ccda5f1.zip | |
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')
| -rwxr-xr-x | arch/arm/bits/alltypes.h.sh | 2 | ||||
| -rwxr-xr-x | arch/i386/bits/alltypes.h.sh | 2 | ||||
| -rwxr-xr-x | arch/x86_64/bits/alltypes.h.sh | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/bits/alltypes.h.sh b/arch/arm/bits/alltypes.h.sh index 11f1d93f..af73e664 100755 --- a/arch/arm/bits/alltypes.h.sh +++ b/arch/arm/bits/alltypes.h.sh @@ -22,7 +22,9 @@ TYPEDEF long ptrdiff_t; TYPEDEF __builtin_va_list va_list; +#ifndef __cplusplus TYPEDEF unsigned wchar_t; +#endif TYPEDEF int wint_t; TYPEDEF long wctrans_t; TYPEDEF long wctype_t; 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; diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh index 19843bd3..10fc3d52 100755 --- a/arch/x86_64/bits/alltypes.h.sh +++ b/arch/x86_64/bits/alltypes.h.sh @@ -21,7 +21,9 @@ TYPEDEF long ssize_t; TYPEDEF long ptrdiff_t; TYPEDEF __builtin_va_list va_list; +#ifndef __cplusplus TYPEDEF int wchar_t; +#endif TYPEDEF int wint_t; TYPEDEF int wctrans_t; TYPEDEF int wctype_t; |