X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Flogbacktrace_unix.cpp;h=c9bedd3d742168f317cdf0d5482b0de33915b0bb;hp=c34e90c4fd83c787066159d07f9898f394ffda92;hb=ed5b2ff32158ae72c011eb1228f373cec05cbfeb;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/common/logbacktrace_unix.cpp b/src/common/logbacktrace_unix.cpp
index c34e90c4..c9bedd3d 100644
--- a/src/common/logbacktrace_unix.cpp
+++ b/src/common/logbacktrace_unix.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 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  *
@@ -15,19 +15,19 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #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);