From ed7a537395f9508fad1518ab9d546daf081840ea Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Fri, 8 Jun 2018 11:13:33 +0200 Subject: [PATCH] moved all epicsExport.h to one place --- src/StreamEpics.cc | 29 +++++++++-------------------- src/devStream.h | 10 ++++++---- src/devaaiStream.c | 1 - src/devaaoStream.c | 1 - src/devaiStream.c | 1 - src/devaoStream.c | 1 - src/devbiStream.c | 1 - src/devboStream.c | 1 - src/devcalcoutStream.c | 1 - src/devint64inStream.c | 1 - src/devint64outStream.c | 1 - src/devlonginStream.c | 1 - src/devlongoutStream.c | 1 - src/devlsiStream.c | 1 - src/devlsoStream.c | 1 - src/devmbbiDirectStream.c | 1 - src/devmbbiStream.c | 1 - src/devmbboDirectStream.c | 1 - src/devmbboStream.c | 1 - src/devscalcoutStream.c | 1 - src/devstringinStream.c | 1 - src/devstringoutStream.c | 1 - src/devwaveformStream.c | 1 - 23 files changed, 15 insertions(+), 45 deletions(-) diff --git a/src/StreamEpics.cc b/src/StreamEpics.cc index 8b53a93..3347fdb 100644 --- a/src/StreamEpics.cc +++ b/src/StreamEpics.cc @@ -53,7 +53,7 @@ extern DBBASE *pdbbase; } // extern "C" -#else +#else // !EPICS_3_13 #include "epicsTimer.h" #include "epicsMutex.h" @@ -64,16 +64,14 @@ extern DBBASE *pdbbase; #include "registryFunction.h" #include "iocsh.h" -#if EPICS_MODIFICATION<9 +#if (!defined VERSION_INT && EPICS_MODIFICATION<9) // iocshCmd() is missing in iocsh.h (up to R3.14.8.2) // To build with win32-x86, you MUST fix iocsh.h. // Move the declaration below to iocsh.h and rebuild base. extern "C" epicsShareFunc int epicsShareAPI iocshCmd(const char *command); #endif -#include "epicsExport.h" - -#endif +#endif // !EPICS_3_13 #include "devStream.h" @@ -179,10 +177,8 @@ public: // shell functions /////////////////////////////////////////////////////// -#ifndef EPICS_3_13 epicsExportAddress(int, streamDebug); epicsExportAddress(int, streamError); -#endif // for subroutine record long streamReloadSub() @@ -274,23 +270,16 @@ static void streamRegistrar () } epicsExportRegistrar(streamRegistrar); -#endif +#endif // !EPICS_3_13 // driver support //////////////////////////////////////////////////////// -struct stream_drvsup { - long number; - long (*report)(int); - long (*init)(); -} stream = { +struct drvet stream = { 2, - Stream::report, - Stream::drvInit + (DRVSUPFUN) Stream::report, + (DRVSUPFUN) Stream::drvInit }; - -#ifndef EPICS_3_13 epicsExportAddress(drvet, stream); -#endif #ifdef EPICS_3_13 void streamEpicsPrintTimestamp(char* buffer, int size) @@ -307,7 +296,7 @@ void streamEpicsPrintTimestamp(char* buffer, int size) tlen = strlen(buffer); sprintf(buffer+tlen, " %.*s", size-tlen-2, taskName(0)); } -#else +#else // !EPICS_3_13 void streamEpicsPrintTimestamp(char* buffer, int size) { int tlen; @@ -315,7 +304,7 @@ void streamEpicsPrintTimestamp(char* buffer, int size) tlen = tm.strftime(buffer, size, "%Y/%m/%d %H:%M:%S.%06f"); sprintf(buffer+tlen, " %.*s", size-tlen-2, epicsThreadGetNameSelf()); } -#endif +#endif // !EPICS_3_13 long Stream:: report(int interest) diff --git a/src/devStream.h b/src/devStream.h index effc640..a58c416 100644 --- a/src/devStream.h +++ b/src/devStream.h @@ -59,10 +59,6 @@ extern "C" { } #endif -#ifndef EPICS_3_13 -#include "shareLib.h" -#endif - typedef const struct format_s { unsigned char type; const struct StreamFormat* priv; @@ -113,4 +109,10 @@ epicsShareFunc long streamScanfN(dbCommon *record, format_t *format, } #endif +#ifndef EPICS_3_13 +#include "epicsExport.h" +#else +#define epicsExportAddress(a,b) extern int dummy +#endif + #endif diff --git a/src/devaaiStream.c b/src/devaaiStream.c index 7c4f626..62d0289 100644 --- a/src/devaaiStream.c +++ b/src/devaaiStream.c @@ -22,7 +22,6 @@ #include #include "errlog.h" #include "aaiRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devaaoStream.c b/src/devaaoStream.c index dfc10d7..2e39ee1 100644 --- a/src/devaaoStream.c +++ b/src/devaaoStream.c @@ -22,7 +22,6 @@ #include #include "errlog.h" #include "aaoRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devaiStream.c b/src/devaiStream.c index 3d8ae0e..810bb89 100644 --- a/src/devaiStream.c +++ b/src/devaiStream.c @@ -22,7 +22,6 @@ #include "epicsMath.h" #include "menuConvert.h" #include "aiRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devaoStream.c b/src/devaoStream.c index 0d9eee2..9c5b8dd 100644 --- a/src/devaoStream.c +++ b/src/devaoStream.c @@ -20,7 +20,6 @@ #include "menuConvert.h" #include "aoRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devbiStream.c b/src/devbiStream.c index 9d7e4d8..d9110f9 100644 --- a/src/devbiStream.c +++ b/src/devbiStream.c @@ -20,7 +20,6 @@ #include #include "biRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devboStream.c b/src/devboStream.c index 886d93f..0ddef6c 100644 --- a/src/devboStream.c +++ b/src/devboStream.c @@ -20,7 +20,6 @@ #include #include "boRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devcalcoutStream.c b/src/devcalcoutStream.c index 44b04db..a74b095 100644 --- a/src/devcalcoutStream.c +++ b/src/devcalcoutStream.c @@ -19,7 +19,6 @@ #include "postfix.h" #include "calcoutRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devint64inStream.c b/src/devint64inStream.c index ab6007c..f4cf57d 100644 --- a/src/devint64inStream.c +++ b/src/devint64inStream.c @@ -18,7 +18,6 @@ ***************************************************************/ #include "int64inRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devint64outStream.c b/src/devint64outStream.c index 4afc59d..377e00a 100644 --- a/src/devint64outStream.c +++ b/src/devint64outStream.c @@ -20,7 +20,6 @@ ***************************************************************/ #include "int64outRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devlonginStream.c b/src/devlonginStream.c index b27ab49..95099fd 100644 --- a/src/devlonginStream.c +++ b/src/devlonginStream.c @@ -19,7 +19,6 @@ ***************************************************************/ #include "longinRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devlongoutStream.c b/src/devlongoutStream.c index 8d3be5b..94f8cef 100644 --- a/src/devlongoutStream.c +++ b/src/devlongoutStream.c @@ -20,7 +20,6 @@ ***************************************************************/ #include "longoutRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devlsiStream.c b/src/devlsiStream.c index e253a72..88e8507 100644 --- a/src/devlsiStream.c +++ b/src/devlsiStream.c @@ -19,7 +19,6 @@ ***************************************************************/ #include "lsiRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devlsoStream.c b/src/devlsoStream.c index 4331783..4df3505 100644 --- a/src/devlsoStream.c +++ b/src/devlsoStream.c @@ -18,7 +18,6 @@ ***************************************************************/ #include "lsoRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devmbbiDirectStream.c b/src/devmbbiDirectStream.c index 752c22a..10b26f9 100644 --- a/src/devmbbiDirectStream.c +++ b/src/devmbbiDirectStream.c @@ -20,7 +20,6 @@ ***************************************************************/ #include "mbbiDirectRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devmbbiStream.c b/src/devmbbiStream.c index 15075b0..167253d 100644 --- a/src/devmbbiStream.c +++ b/src/devmbbiStream.c @@ -21,7 +21,6 @@ #include #include "mbbiRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devmbboDirectStream.c b/src/devmbboDirectStream.c index 9c8f23a..e91c06c 100644 --- a/src/devmbboDirectStream.c +++ b/src/devmbboDirectStream.c @@ -21,7 +21,6 @@ #include "mbboDirectRecord.h" #include "alarm.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devmbboStream.c b/src/devmbboStream.c index 7f18a40..9ac45e9 100644 --- a/src/devmbboStream.c +++ b/src/devmbboStream.c @@ -21,7 +21,6 @@ #include #include "mbboRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devscalcoutStream.c b/src/devscalcoutStream.c index c3ab140..b650a04 100644 --- a/src/devscalcoutStream.c +++ b/src/devscalcoutStream.c @@ -18,7 +18,6 @@ ***************************************************************/ #include "sCalcoutRecord.h" -#include "epicsExport.h" #include "devStream.h" /* Up to version 2-6-1 of the SynApps calc module diff --git a/src/devstringinStream.c b/src/devstringinStream.c index c0a0434..208c81a 100644 --- a/src/devstringinStream.c +++ b/src/devstringinStream.c @@ -19,7 +19,6 @@ ***************************************************************/ #include "stringinRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devstringoutStream.c b/src/devstringoutStream.c index 63f49a7..b215e80 100644 --- a/src/devstringoutStream.c +++ b/src/devstringoutStream.c @@ -19,7 +19,6 @@ ***************************************************************/ #include "stringoutRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format) diff --git a/src/devwaveformStream.c b/src/devwaveformStream.c index b0a32f8..7ffd6e2 100644 --- a/src/devwaveformStream.c +++ b/src/devwaveformStream.c @@ -21,7 +21,6 @@ #include #include "errlog.h" #include "waveformRecord.h" -#include "epicsExport.h" #include "devStream.h" static long readData(dbCommon *record, format_t *format)