From 644c824604a0496aa1e34ad4725abdc54e278860 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Mon, 12 Aug 2019 09:52:52 +0200
Subject: [PATCH] fix version tests for EPICS 7

---
 devS7plcFW.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/devS7plcFW.c b/devS7plcFW.c
index b42afa5..6096460 100644
--- a/devS7plcFW.c
+++ b/devS7plcFW.c
@@ -34,15 +34,14 @@
 #include <stringoutRecord.h>
 #include <waveformRecord.h>
 
-#if ((EPICS_VERSION==3 && EPICS_REVISION>=14) || EPICS_VERSION>3)
-/* R3.14 */
+#ifdef BASE_VERSION
+#define EPICS_3_13
+#include "compat3_13.h"
+#else
 #include <postfix.h>
 #include <calcoutRecord.h>
 #include <cantProceed.h>
 #include <epicsExport.h>
-#else
-/* R3.13 */
-#include "compat3_13.h"
 #endif
 
 /* suppress compiler warning concerning long long with __extension__ */
@@ -361,7 +360,7 @@ struct devsup s7plcFWWaveform =
 epicsExportAddress(dset, s7plcFWWaveform);
 
 /* calcout **********************************************************/
-#if ((EPICS_VERSION==3 && EPICS_REVISION>=14) || EPICS_VERSION>3)
+#ifndef EPICS_3_13
 
 STATIC long s7plcFWInitRecordCalcout(calcoutRecord *);
 STATIC long s7plcFWWriteCalcout(calcoutRecord *);
@@ -2368,8 +2367,8 @@ STATIC long s7plcFWReadWaveform(waveformRecord *record)
     return status;
 }
 
-#if (EPICS_REVISION>=14)
 /* calcout **********************************************************/
+#ifndef EPICS_3_13
 
 STATIC long s7plcFWInitRecordCalcout(calcoutRecord *record)
 {