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

Fix OS X compilation

Browse source
This commit is contained in:
ridiculousfish 2012-08-05 12:05:05 -07:00
parent fdc6c3722a
commit 8de8877c7c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
parser.cpp
View file

@ -2344,10 +2344,10 @@ void parser_t::eval_job( tokenizer *tok )
{ {
if( job_start_pos < tok_get_pos( tok ) ) if( job_start_pos < tok_get_pos( tok ) )
{ {
int stop_pos = tok_get_pos( tok ); long 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<long>( stop_pos, newline - tok_string(tok) );
j->set_command(wcstring(tok_string(tok)+start_pos, stop_pos-start_pos)); j->set_command(wcstring(tok_string(tok)+start_pos, stop_pos-start_pos));
} }

4
reader.cpp
View file

@ -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, 1 ); size_t len = maxi<size_t>( 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, 0 ); len = maxi<size_t>( end-begin, 0 );
begin = end - len; begin = end - len;
while( *end && *end != L'\n' ) while( *end && *end != L'\n' )