]> granicus.if.org Git - icinga2/commitdiff
*NIX build fix.
authorGunnar Beutner <gunnar.beutner@netways.de>
Thu, 7 Mar 2013 14:16:01 +0000 (15:16 +0100)
committerGunnar Beutner <gunnar.beutner@netways.de>
Thu, 7 Mar 2013 14:16:01 +0000 (15:16 +0100)
lib/base/application.cpp
lib/base/stacktrace.cpp

index 6f9add2bcc4ab479b6e15c9f87ec1b6865487778..ecd6c33d7bf756588ec5149a51020a9bc5f1ded0 100644 (file)
@@ -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();
 }
index a08e5bc9f7bfc570710ee29a0e74f5dde285489e..4ed919c4e13cd7e27518b0cb2ad5b092041acf99 100644 (file)
@@ -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 */