lin-epics-modules/sinqS7plcFW
0
0
Fork 0
Code Pull Requests Activity

fix version tests for EPICS 7

Browse Source
This commit is contained in:
zimoch
2019-08-12 09:52:52 +02:00
parent a470205454
commit 644c824604
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
devS7plcFW.c
View File

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