version test fix was incomplete
This commit is contained in:
@ -40,7 +40,7 @@
|
|||||||
|
|
||||||
#include "drvS7plcFW.h"
|
#include "drvS7plcFW.h"
|
||||||
|
|
||||||
#if ((EPICS_VERSION==3 && EPICS_REVISION>=14) || EPICS_VERSION>3)
|
#ifndef BASE_VERSION
|
||||||
/* R3.14 */
|
/* R3.14 */
|
||||||
#include <dbAccess.h>
|
#include <dbAccess.h>
|
||||||
#include <iocsh.h>
|
#include <iocsh.h>
|
||||||
@ -52,6 +52,7 @@
|
|||||||
#include <epicsExport.h>
|
#include <epicsExport.h>
|
||||||
#else
|
#else
|
||||||
/* R3.13 */
|
/* R3.13 */
|
||||||
|
#define EPICS_3_13
|
||||||
#include "compat3_13.h"
|
#include "compat3_13.h"
|
||||||
#endif
|
#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 s7plcFWConfigureArg0 = { "name", iocshArgString };
|
||||||
static const iocshArg s7plcFWConfigureArg1 = { "IPaddr", iocshArgString };
|
static const iocshArg s7plcFWConfigureArg1 = { "IPaddr", iocshArgString };
|
||||||
static const iocshArg s7plcFWConfigureArg2 = { "fetchInfo", iocshArgString };
|
static const iocshArg s7plcFWConfigureArg2 = { "fetchInfo", iocshArgString };
|
||||||
|
Reference in New Issue
Block a user