From c55cbd3f2f003ea6e36727f8b985e880d6aded85 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Tue, 26 Feb 2013 18:31:08 -0800 Subject: Hopeful fix for https://github.com/fish-shell/fish-shell/issues/594 --- fallback.h | 7 ++++--- fish_pager.cpp | 2 +- input.cpp | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fallback.h b/fallback.h index b9460f2b..82cef85d 100644 --- a/fallback.h +++ b/fallback.h @@ -346,12 +346,13 @@ size_t wcslcpy(wchar_t *dst, const wchar_t *src, size_t siz); #endif -#ifdef HAVE_BROKEN_DEL_CURTERM - /** 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 #ifndef HAVE_LRAND48_R diff --git a/fish_pager.cpp b/fish_pager.cpp index 69aad5d9..fb819fab 100644 --- a/fish_pager.cpp +++ b/fish_pager.cpp @@ -1112,7 +1112,7 @@ static void destroy() env_universal_destroy(); input_common_destroy(); wutil_destroy(); - if (del_curterm(cur_term) == ERR) + if (fish_del_curterm(cur_term) == ERR) { debug(0, _(L"Error while closing terminfo")); } diff --git a/input.cpp b/input.cpp index 4432633e..9710db83 100644 --- a/input.cpp +++ b/input.cpp @@ -385,7 +385,7 @@ void input_destroy() input_common_destroy(); - if (del_curterm(cur_term) == ERR) + if (fish_del_curterm(cur_term) == ERR) { debug(0, _(L"Error while closing terminfo")); } -- cgit v1.2.3