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

Hopeful fix for https://github.com/fish-shell/fish-shell/issues/594

Browse source
This commit is contained in:
ridiculousfish 2013-02-26 18:31:08 -08:00
parent d89fcdcc5f
commit c55cbd3f2f
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fallback.h
View file

@ -346,12 +346,13 @@ size_t wcslcpy(wchar_t *dst, const wchar_t *src, size_t siz);
#endif #endif
#ifdef HAVE_BROKEN_DEL_CURTERM
/** /**
BSD del_curterm seems to do a double-free. We redefine it as a no-op BSD del_curterm seems to do a double-free. We redefine it as a no-op
*/ */
#define del_curterm(oterm) OK #ifdef HAVE_BROKEN_DEL_CURTERM
#define fish_del_curterm(X) OK
#else
#define fish_del_curterm(X) del_curterm(X)
#endif #endif
#ifndef HAVE_LRAND48_R #ifndef HAVE_LRAND48_R

2
fish_pager.cpp
View file

@ -1112,7 +1112,7 @@ static void destroy()
env_universal_destroy(); env_universal_destroy();
input_common_destroy(); input_common_destroy();
wutil_destroy(); wutil_destroy();
if (del_curterm(cur_term) == ERR) if (fish_del_curterm(cur_term) == ERR)
{ {
debug(0, _(L"Error while closing terminfo")); debug(0, _(L"Error while closing terminfo"));
} }

2
input.cpp
View file

@ -385,7 +385,7 @@ void input_destroy()
input_common_destroy(); input_common_destroy();
if (del_curterm(cur_term) == ERR) if (fish_del_curterm(cur_term) == ERR)
{ {
debug(0, _(L"Error while closing terminfo")); debug(0, _(L"Error while closing terminfo"));
} }