From deca47597237e8ed03a8aacff632a4e7d3ae77e9 Mon Sep 17 00:00:00 2001 From: Siteshwar Vashisht Date: Sun, 5 Aug 2012 18:37:51 +0530 Subject: [PATCH] Fixed compilation on Linux Addresses issue https://github.com/fish-shell/fish-shell/issues/264 --- parser.cpp | 2 +- reader.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parser.cpp b/parser.cpp index dcfaa3fa1..a70ca37c1 100644 --- a/parser.cpp +++ b/parser.cpp @@ -2344,7 +2344,7 @@ void parser_t::eval_job( tokenizer *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'); if( newline ) stop_pos = mini( stop_pos, newline - tok_string(tok) ); diff --git a/reader.cpp b/reader.cpp index 8aabd5893..39e74a85c 100644 --- a/reader.cpp +++ b/reader.cpp @@ -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 */ - 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' ) begin++; - size_t len = maxi( end-begin, 1L ); + size_t len = maxi( end-begin, 1 ); begin = end - len; 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' ) begin++; - len = maxi( end-begin, 0L ); + len = maxi( end-begin, 0 ); begin = end - len; while( *end && *end != L'\n' )