From 1e0c5466c5a2cd52210270f56f61ac5ca2b1ec4a Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Tue, 9 Oct 2018 12:57:42 -0700 Subject: [PATCH] fixed BACKTRACE_ENABLE macro test --- programs/Makefile | 1 - programs/fileio.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/Makefile b/programs/Makefile index 53f2f280a..9e241357b 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -136,7 +136,6 @@ endif # enable backtrace symbol names for Linux & Darwin BACKTRACE ?= 0 -DEBUGFLAGS = -DBACKTRACE_ENABLE=$(BACKTRACE) ifeq (,$(filter Windows%, $(OS))) ifeq ($(BACKTRACE), 1) DEBUGFLAGS += -DBACKTRACE_ENABLE=1 diff --git a/programs/fileio.c b/programs/fileio.c index aff1b512c..8b1e9f2f2 100644 --- a/programs/fileio.c +++ b/programs/fileio.c @@ -38,7 +38,7 @@ #include #include /* errno */ #include -#ifdef BACKTRACE_ENABLE +#if defined(BACKTRACE_ENABLE) && (BACKTRACE_ENABLE >= 1) # include /* backtrace, backtrace_symbols */ #endif @@ -168,7 +168,7 @@ static void clearHandler(void) /*-********************************************************* * Termination signal trapping (Print debug stack trace) ***********************************************************/ -#ifdef BACKTRACE_ENABLE +#if defined(BACKTRACE_ENABLE) && (BACKTRACE_ENABLE>=1) #define MAX_STACK_FRAMES 50 @@ -209,7 +209,7 @@ static void ABRThandler(int sig) { void FIO_addAbortHandler() { -#ifdef BACKTRACE_ENABLE +#if defined(BACKTRACE_ENABLE) && (BACKTRACE_ENABLE>=1) signal(SIGABRT, ABRThandler); signal(SIGFPE, ABRThandler); signal(SIGILL, ABRThandler); -- 2.47.2