From 7d4f57750b04feb9274e0c7516d6ea7c67e7ba5d Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Thu, 17 Feb 2022 14:39:11 +0100 Subject: [PATCH] version test fix was incomplete --- drvS7plcFW.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drvS7plcFW.c b/drvS7plcFW.c index 16b52c2..3bb054b 100644 --- a/drvS7plcFW.c +++ b/drvS7plcFW.c @@ -40,7 +40,7 @@ #include "drvS7plcFW.h" -#if ((EPICS_VERSION==3 && EPICS_REVISION>=14) || EPICS_VERSION>3) +#ifndef BASE_VERSION /* R3.14 */ #include #include @@ -52,6 +52,7 @@ #include #else /* R3.13 */ +#define EPICS_3_13 #include "compat3_13.h" #endif @@ -370,7 +371,7 @@ int s7plcFWConfigure(char *name, char* IPaddr, char *fetchInfo, char *writeInfo, } /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ -#if (EPICS_REVISION>=14) +#ifndef EPICS_3_13 static const iocshArg s7plcFWConfigureArg0 = { "name", iocshArgString }; static const iocshArg s7plcFWConfigureArg1 = { "IPaddr", iocshArgString }; static const iocshArg s7plcFWConfigureArg2 = { "fetchInfo", iocshArgString };