diff --git a/src/StreamBuffer.h b/src/StreamBuffer.h index e4cb6a6..7eeea2c 100644 --- a/src/StreamBuffer.h +++ b/src/StreamBuffer.h @@ -22,7 +22,6 @@ #include #include - #include #ifndef __GNUC__ diff --git a/src/StreamBusInterface.h b/src/StreamBusInterface.h index f77ea35..000e24e 100644 --- a/src/StreamBusInterface.h +++ b/src/StreamBusInterface.h @@ -21,7 +21,7 @@ #define StreamBusInterface_h #include -#include +#include "StreamBuffer.h" enum StreamIoStatus { StreamIoSuccess, StreamIoTimeout, StreamIoNoReply, diff --git a/src/StreamEpics.cc b/src/StreamEpics.cc index 9117fd9..7cdfefa 100644 --- a/src/StreamEpics.cc +++ b/src/StreamEpics.cc @@ -18,9 +18,6 @@ * * ***************************************************************/ -#define epicsExportSharedSymbols -#include "devStream.h" -#undef epicsExportSharedSymbols #include "StreamCore.h" #include "StreamError.h" @@ -79,6 +76,8 @@ epicsShareFunc int epicsShareAPI iocshCmd(const char *command); #endif +#include "devStream.h" + #if defined(__vxworks) || defined(vxWorks) #include #include diff --git a/src/StreamProtocol.h b/src/StreamProtocol.h index 4a859d8..4200621 100644 --- a/src/StreamProtocol.h +++ b/src/StreamProtocol.h @@ -21,8 +21,8 @@ #ifndef StreamProtocol_h #define StreamProtocol_h -#include "StreamBuffer.h" #include +#include "StreamBuffer.h" enum FormatType {NoFormat, ScanFormat, PrintFormat}; diff --git a/src/devStream.h b/src/devStream.h index 70ae4c0..346b910 100644 --- a/src/devStream.h +++ b/src/devStream.h @@ -49,11 +49,6 @@ extern "C" { #endif -#ifdef epicsExportSharedSymbols -# define devStream_epicsExportSharedSymbols -# undef epicsExportSharedSymbols -#endif - #include #include #include @@ -61,15 +56,13 @@ extern "C" { /* #include */ #include -#ifdef devStream_epicsExportSharedSymbols -# define epicsExportSharedSymbols -# include "shareLib.h" -#endif - #if defined(__cplusplus) && defined(EPICS_3_13) } #endif +#ifndef EPICS_3_13 +#include "shareLib.h" +#endif typedef const struct format_s { unsigned char type; diff --git a/src/devaaiStream.c b/src/devaaiStream.c index 7f03e8a..33ed0db 100644 --- a/src/devaaiStream.c +++ b/src/devaaiStream.c @@ -20,10 +20,10 @@ #include #include -#include -#include +#include "errlog.h" +#include "aaiRecord.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/src/devaaoStream.c b/src/devaaoStream.c index 0edb81b..c41c2e1 100644 --- a/src/devaaoStream.c +++ b/src/devaaoStream.c @@ -20,10 +20,10 @@ #include #include -#include -#include +#include "errlog.h" +#include "aaoRecord.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/src/devaiStream.c b/src/devaiStream.c index 5741e05..c3d12ee 100644 --- a/src/devaiStream.c +++ b/src/devaiStream.c @@ -19,11 +19,11 @@ ***************************************************************/ #include -#include -#include -#include +#include "epicsMath.h" +#include "menuConvert.h" +#include "aiRecord.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/src/devaoStream.c b/src/devaoStream.c index 36129eb..abf160f 100644 --- a/src/devaoStream.c +++ b/src/devaoStream.c @@ -18,10 +18,10 @@ * * ***************************************************************/ -#include -#include +#include "menuConvert.h" +#include "aoRecord.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/src/devbiStream.c b/src/devbiStream.c index 4a8bbbc..e22f287 100644 --- a/src/devbiStream.c +++ b/src/devbiStream.c @@ -19,9 +19,9 @@ ***************************************************************/ #include -#include +#include "biRecord.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/src/devboStream.c b/src/devboStream.c index ebc0dc2..0103e69 100644 --- a/src/devboStream.c +++ b/src/devboStream.c @@ -19,9 +19,9 @@ ***************************************************************/ #include -#include +#include "boRecord.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/src/devcalcoutStream.c b/src/devcalcoutStream.c index 8cee99e..ffd4805 100644 --- a/src/devcalcoutStream.c +++ b/src/devcalcoutStream.c @@ -17,10 +17,10 @@ * * ***************************************************************/ -#include -#include +#include "postfix.h" +#include "calcoutRecord.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/src/devlonginStream.c b/src/devlonginStream.c index 9f714fa..9dd616e 100644 --- a/src/devlonginStream.c +++ b/src/devlonginStream.c @@ -18,9 +18,9 @@ * * ***************************************************************/ -#include +#include "longinRecord.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/src/devlongoutStream.c b/src/devlongoutStream.c index c2b21ee..329ab3a 100644 --- a/src/devlongoutStream.c +++ b/src/devlongoutStream.c @@ -19,9 +19,9 @@ * * ***************************************************************/ -#include +#include "longoutRecord.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/src/devmbbiDirectStream.c b/src/devmbbiDirectStream.c index 34e634d..e20656b 100644 --- a/src/devmbbiDirectStream.c +++ b/src/devmbbiDirectStream.c @@ -19,9 +19,9 @@ * * ***************************************************************/ -#include +#include "mbbiDirectRecord.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/src/devmbbiStream.c b/src/devmbbiStream.c index ad6fd04..6aa2d3a 100644 --- a/src/devmbbiStream.c +++ b/src/devmbbiStream.c @@ -20,9 +20,9 @@ ***************************************************************/ #include -#include +#include "mbbiRecord.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/src/devmbboDirectStream.c b/src/devmbboDirectStream.c index 9281436..108bbb2 100644 --- a/src/devmbboDirectStream.c +++ b/src/devmbboDirectStream.c @@ -19,10 +19,10 @@ * * ***************************************************************/ -#include +#include "mbboDirectRecord.h" #include "alarm.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/src/devmbboStream.c b/src/devmbboStream.c index c00508b..fd1e261 100644 --- a/src/devmbboStream.c +++ b/src/devmbboStream.c @@ -20,9 +20,9 @@ ***************************************************************/ #include -#include +#include "mbboRecord.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/src/devstringinStream.c b/src/devstringinStream.c index 5f02eeb..d20e853 100644 --- a/src/devstringinStream.c +++ b/src/devstringinStream.c @@ -18,9 +18,9 @@ * * ***************************************************************/ -#include +#include "stringinRecord.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/src/devstringoutStream.c b/src/devstringoutStream.c index fcc2d6b..084ec02 100644 --- a/src/devstringoutStream.c +++ b/src/devstringoutStream.c @@ -18,9 +18,9 @@ * * ***************************************************************/ -#include +#include "stringoutRecord.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/src/devwaveformStream.c b/src/devwaveformStream.c index b6fadae..f5c22ba 100644 --- a/src/devwaveformStream.c +++ b/src/devwaveformStream.c @@ -19,10 +19,10 @@ ***************************************************************/ #include -#include -#include +#include "errlog.h" +#include "waveformRecord.h" +#include "epicsExport.h" #include "devStream.h" -#include static long readData (dbCommon *record, format_t *format) { diff --git a/srcSynApps/devscalcoutStream.c b/srcSynApps/devscalcoutStream.c index f487242..21b397f 100644 --- a/srcSynApps/devscalcoutStream.c +++ b/srcSynApps/devscalcoutStream.c @@ -17,9 +17,9 @@ * * ***************************************************************/ -#include -#include -#include +#include "sCalcoutRecord.h" +#include "epicsExport.h" +#include "devStream.h" /* scalcout record has a bug: it never calls init_record of the device support. diff --git a/streamApp/streamAppMain.cc b/streamApp/streamAppMain.cc index b633446..31a74d5 100644 --- a/streamApp/streamAppMain.cc +++ b/streamApp/streamAppMain.cc @@ -17,9 +17,9 @@ * * ***************************************************************/ -#include -#include -#include +#include "epicsThread.h" +#include "iocsh.h" +#include "devStream.h" int main(int argc,char *argv[]) {