Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-27 20:25:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed compilation on Linux

Browse source 
Addresses issue https://github.com/fish-shell/fish-shell/issues/264
This commit is contained in:
Siteshwar Vashisht 2012-08-05 18:37:51 +05:30
parent ba070e21e4
commit deca475972
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
parser.cpp
View file

@ -2344,7 +2344,7 @@ void parser_t::eval_job( tokenizer *tok )
{ {
if( job_start_pos < tok_get_pos( tok ) ) if( job_start_pos < tok_get_pos( tok ) )
{ {
long stop_pos = tok_get_pos( tok ); int stop_pos = tok_get_pos( tok );
const wchar_t *newline = wcschr(tok_string(tok)+start_pos, L'\n'); const wchar_t *newline = wcschr(tok_string(tok)+start_pos, L'\n');
if( newline ) if( newline )
stop_pos = mini( stop_pos, newline - tok_string(tok) ); stop_pos = mini( stop_pos, newline - tok_string(tok) );

6
reader.cpp
View file

@ -1948,7 +1948,7 @@ static void move_word( int dir, int erase, int newv )
/* /*
Make sure we don't move beyond begining or end of buffer Make sure we don't move beyond begining or end of buffer
*/ */
end_buff_pos = maxi( 0UL, mini( end_buff_pos, data->command_length() ) ); end_buff_pos = maxi( (size_t)0, mini( end_buff_pos, data->command_length() ) );
@ -2744,7 +2744,7 @@ const wchar_t *reader_readline()
if( *begin == L'\n' ) if( *begin == L'\n' )
begin++; begin++;
size_t len = maxi( end-begin, 1L ); size_t len = maxi( end-begin, 1 );
begin = end - len; begin = end - len;
reader_kill( begin - buff, len, KILL_PREPEND, last_char!=R_BACKWARD_KILL_LINE ); reader_kill( begin - buff, len, KILL_PREPEND, last_char!=R_BACKWARD_KILL_LINE );
@ -2767,7 +2767,7 @@ const wchar_t *reader_readline()
if( *begin == L'\n' ) if( *begin == L'\n' )
begin++; begin++;
len = maxi( end-begin, 0L ); len = maxi( end-begin, 0 );
begin = end - len; begin = end - len;
while( *end && *end != L'\n' ) while( *end && *end != L'\n' )