h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-30 19:41:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed compilation on Linux with some minor changes.

Browse Source
This commit is contained in:
Siteshwar Vashisht
2012-02-28 21:20:09 +05:30
parent cf54ad8242
commit 392232246e
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
parser.cpp
View File

@@ -18,6 +18,7 @@ The fish parser. Contains functions for parsing and evaluating code.
#include <pwd.h>
#include <dirent.h>
#include <signal.h>
#include <algorithm>
#include "fallback.h"
#include "util.h"
@@ -1244,7 +1245,7 @@ bool parser_t::job_remove( job_t *j )
void parser_t::job_promote(job_t *job)
{
job_list_t::iterator loc = find(my_job_list.begin(), my_job_list.end(), job);
job_list_t::iterator loc = std::find(my_job_list.begin(), my_job_list.end(), job);
assert(loc != my_job_list.end());
/* Move the job to the beginning */
@@ -2308,7 +2309,7 @@ void parser_t::eval_job( tokenizer *tok )
if( job_start_pos < tok_get_pos( tok ) )
{
int stop_pos = tok_get_pos( tok );
wchar_t *newline = wcschr( tok_string(tok)+start_pos,
const wchar_t *newline = wcschr( tok_string(tok)+start_pos,
L'\n' );
if( newline )
stop_pos = mini( stop_pos, newline - tok_string(tok) );