tests: Convert ExpressionMatchTests into a GTest-based test case

[quassel.git] / src / common / logbacktrace_unix.cpp

diff --git a/src/common/logbacktrace_unix.cpp b/src/common/logbacktrace_unix.cpp
index 11e2550..c9bedd3 100644 (file)
--- a/src/common/logbacktrace_unix.cpp
+++ b/src/common/logbacktrace_unix.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,14 +20,14 @@
 
 #include "quassel.h"
 
-#if defined(HAVE_EXECINFO) && !defined(Q_OS_MAC)
+#if defined(HAVE_BACKTRACE) && !defined(Q_OS_MAC)
 #  define BUILD_CRASHHANDLER
-#  include <execinfo.h>
 #  include <dlfcn.h>
 #  include <cxxabi.h>
 #  include <QFile>
 #  include <QTextStream>
 #  include <QDebug>
+#  include "backtrace_config.h"
 #endif
 
 void Quassel::logBacktrace(const QString &filename)
@@ -54,7 +54,7 @@ void Quassel::logBacktrace(const QString &filename)
         //       void *dli_saddr;           /* Exact value of nearest symbol.  */
         //     } Dl_info;
 
-    #if __LP64__
+    #ifdef __LP64__
         int addrSize = 16;
     #else
         int addrSize = 8;
@@ -62,7 +62,7 @@ void Quassel::logBacktrace(const QString &filename)
 
         QString funcName;
         if (info.dli_sname) {
-            char *func = abi::__cxa_demangle(info.dli_sname, 0, 0, 0);
+            char *func = abi::__cxa_demangle(info.dli_sname, nullptr, nullptr, nullptr);
             if (func) {
                 funcName = QString(func);
                 free(func);