From e54604c0e36413903eb984c531a7894e0ee163c3 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 7 Mar 2013 15:16:01 +0100 Subject: [PATCH] *NIX build fix. --- lib/base/application.cpp | 3 ++- lib/base/stacktrace.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/base/application.cpp b/lib/base/application.cpp index 6f9add2bc..ecd6c33d7 100644 --- a/lib/base/application.cpp +++ b/lib/base/application.cpp @@ -317,7 +317,8 @@ void Application::SigAbrtHandler(int signum) std::cerr << "Caught SIGABRT." << std::endl; - Utility::PrintStacktrace(std::cerr, 1); + StackTrace trace; + trace.Print(std::cerr, 1); DisplayBugMessage(); } diff --git a/lib/base/stacktrace.cpp b/lib/base/stacktrace.cpp index a08e5bc9f..4ed919c4e 100644 --- a/lib/base/stacktrace.cpp +++ b/lib/base/stacktrace.cpp @@ -88,8 +88,10 @@ StackTrace::StackTrace(PEXCEPTION_POINTERS exi) void StackTrace::Initialize(void) { +#ifdef _WIN32 (void) SymSetOptions(SYMOPT_UNDNAME | SYMOPT_LOAD_LINES); (void) SymInitialize(GetCurrentProcess(), NULL, TRUE); +#endif /* _WIN32 */ } /** @@ -133,8 +135,6 @@ void StackTrace::Print(ostream& fp, int ignoreFrames) free(messages); fp << std::endl; - - return true; # else /* HAVE_BACKTRACE_SYMBOLS */ fp << "(not available)" << std::endl; # endif /* HAVE_BACKTRACE_SYMBOLS */ -- 2.40.0