Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 04:43:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix compilation failures under Intel C compiler.

Browse source 
It appears that Intel C compiler doesn't recognize unsigned wchar_t,
however it doesn't appear to be important (the conversion function is
unused, and in other cases it doesn't appear to be needed).
This commit is contained in:
Konrad Borowski 2013-11-27 21:10:28 +01:00
parent 0e7790df8c
commit 1eb09f3eb2
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
builtin_printf.cpp
View file

@ -195,11 +195,6 @@ double C_STRTOD(wchar_t const *nptr, wchar_t **endptr)
return r;
}
static inline unsigned wchar_t to_uwchar_t(wchar_t ch)
{
return ch;
}
void builtin_printf_state_t::fatal_error(const wchar_t *fmt, ...)
{
// Don't error twice
@ -292,7 +287,7 @@ static T string_to_scalar_type(const wchar_t *s, builtin_printf_state_t *state)
T val;
if (*s == L'\"' || *s == L'\'')
{
unsigned wchar_t ch = *++s;
wchar_t ch = *++s;
val = ch;
}
else
@ -736,7 +731,7 @@ no_more_flag_characters:
++f;
{
unsigned wchar_t conversion = *f;
wchar_t conversion = *f;
if (! ok[conversion])
{
this->fatal_error(_(L"%.*ls: invalid conversion specification"), (int)(f + 1 - direc_start), direc_start);