fix version tests for EPICS 7

Makefile

@@ -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

devS7plcFW.c

@@ -34,15 +34,14 @@
 #include <stringoutRecord.h>
 #include <waveformRecord.h>
 
-#if ((EPICS_VERSION==3 && EPICS_REVISION>=14) || EPICS_VERSION>3)
+#ifdef BASE_VERSION
-/* R3.14 */
+#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 *);
@@ -1761,7 +1760,7 @@ STATIC long s7plcFWReadAi(aiRecord *record)
         case epicsFloat64T:
             status = s7plcFWRead(priv->station, priv->offs,
                 8, &val64);
-            __extension__ s7plcFWDebugLog(3, "ai %s: read 64bit %08Lx = %g\n",
+            __extension__ s7plcFWDebugLog(3, "ai %s: read 64bit " CONV64 " = %g\n",
                 record->name, val64.i, val64.f);
             floatval = TRUE;
             break;
@@ -2025,7 +2024,7 @@ STATIC long s7plcFWInitRecordStringin(stringinRecord *record)
     {
         errlogSevPrintf(errlogMinor,
             "%s: string size reduced from %d to %d\n",
-            record->name, priv->dlen, sizeof(record->val));
+            record->name, priv->dlen, (int)sizeof(record->val));
         priv->dlen = sizeof(record->val);
     }
     record->dpvt = priv;
@@ -2105,7 +2104,7 @@ STATIC long s7plcFWInitRecordStringout(stringoutRecord *record)
     {
         errlogSevPrintf(errlogMinor,
             "%s: string size reduced from %d to %d\n",
-            record->name, priv->dlen, sizeof(record->val));
+            record->name, priv->dlen, (int)sizeof(record->val));
         priv->dlen = sizeof(record->val);
     }
     record->dpvt = priv;
@@ -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)
 {