use #if BACKTRACE_ENABLE directly

as suggested by @terrelln
This commit is contained in:
Yann Collet
2018-10-09 17:56:59 -07:00
parent 0ea286f740
commit b304b679e5
+12 -6
View File
@@ -166,14 +166,20 @@ static void clearHandler(void)
# define BACKTRACE_ENABLE 0 # define BACKTRACE_ENABLE 0
#endif #endif
#if !defined(BACKTRACE_ENABLE) \ #if !defined(BACKTRACE_ENABLE)
&& ((defined(__linux__) && defined(__GLIBC__)) \ /* automatic detector : backtrace enabled by default on linux+glibc and osx */
|| (defined(__APPLE__) && defined(__MACH__)) ) # if (defined(__linux__) && defined(__GLIBC__)) \
# define BACKTRACE_ENABLE 1 || (defined(__APPLE__) && defined(__MACH__))
# define BACKTRACE_ENABLE 1
# else
# define BACKTRACE_ENABLE 0
# endif
#endif #endif
/* note : after this point, BACKTRACE_ENABLE is necessarily defined */
#if defined(BACKTRACE_ENABLE) && (BACKTRACE_ENABLE>=1)
#if BACKTRACE_ENABLE
#include <execinfo.h> /* backtrace, backtrace_symbols */ #include <execinfo.h> /* backtrace, backtrace_symbols */
@@ -216,7 +222,7 @@ static void ABRThandler(int sig) {
void FIO_addAbortHandler() void FIO_addAbortHandler()
{ {
#if defined(BACKTRACE_ENABLE) && (BACKTRACE_ENABLE>=1) #if BACKTRACE_ENABLE
signal(SIGABRT, ABRThandler); signal(SIGABRT, ABRThandler);
signal(SIGFPE, ABRThandler); signal(SIGFPE, ABRThandler);
signal(SIGILL, ABRThandler); signal(SIGILL, ABRThandler);