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

fix building on Cygwin

Browse Source 
Cygwin still doesn't support any of the backtrace functions. Also, remove a
spurious newline from a debug message.

Fixes #2993
This commit is contained in:
Kurtis Rader
2016-05-19 19:27:22 -07:00
parent 46be5ac468
commit 7c24369454
5 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common.cpp
View File

@@ -70,7 +70,9 @@ static volatile bool termsize_valid;
static rwlock_t termsize_rwlock;
static char *wcs2str_internal(const wchar_t *in, char *out);
static void debug_shared(const wchar_t msg_level, const wcstring &msg);
#ifdef HAVE_BACKTRACE_SYMBOLS
// This function produces a stack backtrace with demangled function & method names. It is based on
// https://gist.github.com/fmela/591333 but adapted to the style of the fish project.
static const wcstring_list_t __attribute__((noinline))
@@ -104,7 +106,6 @@ demangled_backtrace(int max_frames, int skip_levels) {
return backtrace_text;
}
static void debug_shared(const wchar_t msg_level, const wcstring &msg);
void __attribute__((noinline)) show_stackframe(const wchar_t msg_level, int frame_count,
int skip_levels) {
ASSERT_IS_NOT_FORKED_CHILD();
@@ -124,6 +125,14 @@ void __attribute__((noinline)) show_stackframe(const wchar_t msg_level, int fram
}
}
#else // HAVE_BACKTRACE_SYMBOLS
void __attribute__((noinline)) show_stackframe(const wchar_t msg_level, int frame_count,
int skip_levels) {
debug_shared(msg_level, L"Sorry, but your system does not support backtraces");
}
#endif // HAVE_BACKTRACE_SYMBOLS
int fgetws2(wcstring *s, FILE *f) {
int i = 0;
wint_t c;