From: Yann Collet <cyan@fb.com>
Date: Tue, 9 Oct 2018 19:57:42 +0000 (-0700)
Subject: fixed BACKTRACE_ENABLE macro test
X-Git-Tag: v1.3.7~7^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e0c5466c5a2cd52210270f56f61ac5ca2b1ec4a;p=thirdparty%2Fzstd.git

fixed BACKTRACE_ENABLE macro test
---

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 <assert.h>
 #include <errno.h>      /* errno */
 #include <signal.h>
-#ifdef BACKTRACE_ENABLE
+#if defined(BACKTRACE_ENABLE) && (BACKTRACE_ENABLE >= 1)
 #  include <execinfo.h>   /* 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);