projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compile on Wintendo again. Learn fucking POSIX!
[quassel.git]
/
src
/
common
/
quassel.cpp
diff --git
a/src/common/quassel.cpp
b/src/common/quassel.cpp
index
9761bfb
..
1ecc896
100644
(file)
--- a/
src/common/quassel.cpp
+++ b/
src/common/quassel.cpp
@@
-35,6
+35,7
@@
#include "syncableobject.h"
#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)
#include "syncableobject.h"
#if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)
+# define BUILD_CRASHHANDLER
# include <execinfo.h>
# include <dlfcn.h>
# include <cxxabi.h>
# include <execinfo.h>
# include <dlfcn.h>
# include <cxxabi.h>
@@
-51,7
+52,7
@@
Quassel::Quassel() {
signal(SIGTERM, handleSignal);
signal(SIGINT, handleSignal);
signal(SIGTERM, handleSignal);
signal(SIGINT, handleSignal);
-#if
defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)
+#if
def BUILD_CRASHHANDLER
signal(SIGABRT, handleSignal);
signal(SIGBUS, handleSignal);
signal(SIGSEGV, handleSignal);
signal(SIGABRT, handleSignal);
signal(SIGBUS, handleSignal);
signal(SIGSEGV, handleSignal);
@@
-179,10
+180,12
@@
void Quassel::handleSignal(int sig) {
QCoreApplication::quit();
break;
QCoreApplication::quit();
break;
+#ifdef BUILD_CRASHHANDLER
case SIGABRT:
case SIGBUS:
case SIGSEGV:
handleCrash();
case SIGABRT:
case SIGBUS:
case SIGSEGV:
handleCrash();
+#endif
break;
default:
break;
break;
default:
break;
@@
-190,7
+193,7
@@
void Quassel::handleSignal(int sig) {
}
void Quassel::handleCrash() {
}
void Quassel::handleCrash() {
-#if
defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)
+#if
def BUILD_CRASHHANDLER
void* callstack[128];
int i, frames = backtrace(callstack, 128);
void* callstack[128];
int i, frames = backtrace(callstack, 128);
@@
-250,7
+253,7
@@
void Quassel::handleCrash() {
}
dumpFile.close();
exit(27);
}
dumpFile.close();
exit(27);
-#endif /
/ #if defined(HAVE_EXECINFO) and not defined(Q_OS_MAC)
+#endif /
* BUILD_CRASHHANDLER */
}
// FIXME temporary
}
// FIXME temporary