diff options
author | ridiculousfish <corydoras@ridiculousfish.com> | 2012-08-05 12:05:05 -0700 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2012-08-05 12:05:05 -0700 |
commit | 8de8877c7c0972db668b06ca5d693f622a54c97a (patch) | |
tree | f1a5f14ae35190cc50c0aa40ce0feef81a385ab0 | |
parent | fdc6c3722a3a857c839cfdf798a5bbbd006164e4 (diff) |
Fix OS X compilation
-rw-r--r-- | parser.cpp | 4 | ||||
-rw-r--r-- | reader.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -2344,10 +2344,10 @@ void parser_t::eval_job( tokenizer *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'); 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)); } @@ -2744,7 +2744,7 @@ const wchar_t *reader_readline() if( *begin == L'\n' ) begin++; - size_t len = maxi( end-begin, 1 ); + size_t len = maxi<size_t>( 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, 0 ); + len = maxi<size_t>( end-begin, 0 ); begin = end - len; while( *end && *end != L'\n' ) |