Commit | Line | Data |
---|---|---|
8e66b39b FF |
1 | diff -u -r ../fish-shell-c76d86631717929b3a2f259615e8603e69e13256/src/common.cpp ./src/common.cpp |
2 | --- ../fish-shell-c76d86631717929b3a2f259615e8603e69e13256/src/common.cpp 2016-05-03 01:20:53.000000000 -0400 | |
3 | +++ ./src/common.cpp 2016-05-03 07:16:32.052328928 -0400 | |
4 | @@ -68,6 +68,7 @@ | |
5 | void show_stackframe() { | |
6 | ASSERT_IS_NOT_FORKED_CHILD(); | |
7 | ||
8 | +#ifndef __ANDROID__ | |
9 | // Hack to avoid showing backtraces in the tester. | |
10 | if (program_name && !wcscmp(program_name, L"(ignore)")) return; | |
11 | ||
12 | @@ -77,6 +78,7 @@ | |
13 | trace_size = backtrace(trace, 32); | |
14 | debug(0, L"Backtrace:"); | |
15 | backtrace_symbols_fd(trace, trace_size, STDERR_FILENO); | |
16 | +#endif | |
17 | } | |
18 | ||
19 | int fgetws2(wcstring *s, FILE *f) { |