fix version tests for EPICS 7

build for all EPICS version
2019-08-12 09:52:52 +02:00 · 2019-08-12 09:45:22 +02:00
2 changed files with 6 additions and 11 deletions
--- a/4
+++ b/4
@ -5,7 +5,3 @@ BUILDCLASSES+=Linux
 DBDS += s7plcFWBase.dbd
 DBDS_3.14 += s7plcFWCalcout.dbd
 DBDS_3.14 += s7plcFWReg.dbd
-
-EPICS_VERSIONS =
-EPICS_VERSIONS += 3.14.8
-EPICS_VERSIONS += 3.14.12
--- 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)
 {
Author	SHA1	Message	Date
Dirk Zimoch	644c824604	fix version tests for EPICS 7	2019-08-12 09:52:52 +02:00
Dirk Zimoch	a470205454	build for all EPICS version	2019-08-12 09:45:22 +02:00