From 48ca7b34c74e9f91046ff1d9d12ee37205832c2e Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Thu, 16 Apr 2020 21:30:45 -0700 Subject: [PATCH] fix VERSION_INT() order defined in pvxs/version.h included via utilpvt.h --- src/log.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/log.cpp b/src/log.cpp index a4790bf..89222d0 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -28,15 +28,12 @@ #include #include -#if EPICS_VERSION_INT>=VERSION_INT(3,15,0,0) -# include -# define USE_STACKTRACE -#endif - #include "evhelper.h" #include "utilpvt.h" -#ifndef USE_STACKTRACE +#if EPICS_VERSION_INT>=VERSION_INT(3,15,0,0) +# include +#else static void epicsStackTrace() {} #endif