jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't define wchar_t on c++

Browse source 
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.
This commit is contained in:
Rich Felker 2011-10-15 00:28:49 -04:00
commit 1d3c276807
3 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/bits/alltypes.h.sh
View file

@ -22,7 +22,9 @@ TYPEDEF long ptrdiff_t;
TYPEDEF __builtin_va_list va_list; TYPEDEF __builtin_va_list va_list;
#ifndef __cplusplus
TYPEDEF unsigned wchar_t; TYPEDEF unsigned wchar_t;
#endif
TYPEDEF int wint_t; TYPEDEF int wint_t;
TYPEDEF long wctrans_t; TYPEDEF long wctrans_t;
TYPEDEF long wctype_t; TYPEDEF long wctype_t;

2
arch/i386/bits/alltypes.h.sh
View file

@ -26,11 +26,13 @@ TYPEDEF __builtin_va_list va_list;
TYPEDEF struct __va_list * va_list; TYPEDEF struct __va_list * va_list;
#endif #endif
#ifndef __cplusplus
#ifdef __WCHAR_TYPE__ #ifdef __WCHAR_TYPE__
TYPEDEF __WCHAR_TYPE__ wchar_t; TYPEDEF __WCHAR_TYPE__ wchar_t;
#else #else
TYPEDEF long wchar_t; TYPEDEF long wchar_t;
#endif #endif
#endif
TYPEDEF long wint_t; TYPEDEF long wint_t;
TYPEDEF long wctrans_t; TYPEDEF long wctrans_t;
TYPEDEF long wctype_t; TYPEDEF long wctype_t;

2
arch/x86_64/bits/alltypes.h.sh
View file

@ -21,7 +21,9 @@ TYPEDEF long ssize_t;
TYPEDEF long ptrdiff_t; TYPEDEF long ptrdiff_t;
TYPEDEF __builtin_va_list va_list; TYPEDEF __builtin_va_list va_list;
#ifndef __cplusplus
TYPEDEF int wchar_t; TYPEDEF int wchar_t;
#endif
TYPEDEF int wint_t; TYPEDEF int wint_t;
TYPEDEF int wctrans_t; TYPEDEF int wctrans_t;
TYPEDEF int wctype_t; TYPEDEF int wctype_t;