Skip to content

Commit b62e055

Browse files
committed
Remove Base 3.14 specific code
As of caPutLog R4.1, Base 3.14 is not supported (because caPutLog's use of epicsAtomic)
1 parent 1d8c62e commit b62e055

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

caPutLogApp/caPutLogAs.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,7 @@
5151
#include <asTrapWrite.h>
5252
#include <epicsVersion.h>
5353

54-
#define BASE_3_14 (EPICS_VERSION * 100 + EPICS_REVISION < 315)
55-
56-
#if !(BASE_3_14)
5754
#include "dbChannel.h"
58-
#endif
5955

6056
#define epicsExportSharedSymbols
6157
#include "caPutLog.h"
@@ -114,13 +110,9 @@ void caPutLogAsStop()
114110

115111
static void caPutLogAs(asTrapWriteMessage *pmessage, int afterPut)
116112
{
117-
#if BASE_3_14
118-
dbAddr *paddr = pmessage->serverSpecific;
119-
#else
120113
struct dbChannel *pchan = pmessage->serverSpecific;
121114
dbAddr *paddr = &pchan->addr;
122115
const char *pv_name = pchan->name;
123-
#endif
124116
LOGDATA *plogData;
125117
long options, num_elm;
126118
long status;
@@ -143,11 +135,7 @@ static void caPutLogAs(asTrapWriteMessage *pmessage, int afterPut)
143135

144136
epicsSnprintf(plogData->userid, MAX_USERID_SIZE, "%s", pmessage->userid);
145137
epicsSnprintf(plogData->hostid, MAX_HOSTID_SIZE, "%s", pmessage->hostid);
146-
#if BASE_3_14
147-
dbNameOfPV(paddr, plogData->pv_name, PVNAME_STRINGSZ);
148-
#else
149138
epicsSnprintf(plogData->pv_name, PVNAME_STRINGSZ, "%s", pv_name);
150-
#endif
151139

152140
if (VALID_DB_REQ(paddr->field_type)) {
153141
plogData->type = paddr->field_type;

0 commit comments

Comments
 (0)