github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-24 20:05:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed compilation with recent changes on Linux.

Browse Source
This commit is contained in:
Siteshwar Vashisht 2012-02-10 21:25:06 +05:30
parent d975187433
commit 18bb64cd43
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
complete.cpp
View File

@ -594,7 +594,7 @@ int complete_is_valid_option( const wchar_t *str,
{
//PCA Rewrite this
wchar_t *str_pos = wcschr(i->short_opt_str.c_str(), *a);
wchar_t *str_pos = const_cast<wchar_t*>(wcschr(i->short_opt_str.c_str(), *a));
if (str_pos )
{

3
event.h
View File

@ -12,8 +12,9 @@
#ifndef FISH_EVENT_H
#define FISH_EVENT_H
#include <memory>
#include "common.h"
#include "event.h"
/**
The signal number that is used to match any signal

3
exec.cpp
View File

@ -25,6 +25,7 @@
#include <time.h>
#include <vector>
#include <deque>
#include <algorithm>
#ifdef HAVE_SIGINFO_H
#include <siginfo.h>
@ -128,7 +129,7 @@ void exec_close( int fd )
}
/* Maybe remove this form our set of open fds */
open_fds.erase(remove(open_fds.begin(), open_fds.end(), fd), open_fds.end());
open_fds.erase(std::remove(open_fds.begin(), open_fds.end(), fd), open_fds.end());
}
int exec_pipe( int fd[2])