h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-08 02:31:18 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fix the compilation under gcc 4.9.0.

Browse Source 
gcc interpretes C99's compound literals more strictly by invalid the
compound literal on implicit to pointer cast (because of automatic
storage duration, 6.5.2.5.6 in C99 standard draft).

This fixes the issue by not using compound literals at all.
This commit is contained in:
Konrad Borowski
2014-08-22 21:52:41 +02:00
parent f9f773cc28
commit 1f3a93a3af
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtin.cpp
View File

@@ -2636,7 +2636,13 @@ static int builtin_read(parser_t &parser, wchar_t **argv)
size_t j = 0;
for (; i+1 < argc; ++i)
{
env_set(argv[i], j < bufflen ? (wchar_t[2]){buff[j], 0} : L"", place);
if (j < bufflen) {
wchar_t buffer[2] = {buff[j], 0};
env_set(argv[i], buffer, place);
}
else {
env_set(argv[i], L"", place);
}
if (j < bufflen) ++j;
}
if (i < argc) env_set(argv[i], &buff[j], place);