moved all epicsExport.h to one place

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 // !EPICS_3_13
-
-#endif
 
 #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 {
+struct drvet stream = {
-    long number;
-    long (*report)(int);
-    long (*init)();
-} stream = {
     2,
-    Stream::report,
+    (DRVSUPFUN) Stream::report,
-    Stream::drvInit
+    (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)

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

src/devaaiStream.c

@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include "errlog.h"
 #include "aaiRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)

src/devaaoStream.c

@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include "errlog.h"
 #include "aaoRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)

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)

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)

src/devbiStream.c

@@ -20,7 +20,6 @@
 
 #include <string.h>
 #include "biRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)

src/devboStream.c

@@ -20,7 +20,6 @@
 
 #include <string.h>
 #include "boRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)

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)

src/devint64inStream.c

@@ -18,7 +18,6 @@
 ***************************************************************/
 
 #include "int64inRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)

src/devint64outStream.c

@@ -20,7 +20,6 @@
 ***************************************************************/
 
 #include "int64outRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)

src/devlonginStream.c

@@ -19,7 +19,6 @@
 ***************************************************************/
 
 #include "longinRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)

src/devlongoutStream.c

@@ -20,7 +20,6 @@
 ***************************************************************/
 
 #include "longoutRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)

src/devlsiStream.c

@@ -19,7 +19,6 @@
 ***************************************************************/
 
 #include "lsiRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)

src/devlsoStream.c

@@ -18,7 +18,6 @@
 ***************************************************************/
 
 #include "lsoRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)

src/devmbbiDirectStream.c

@@ -20,7 +20,6 @@
 ***************************************************************/
 
 #include "mbbiDirectRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)

src/devmbbiStream.c

@@ -21,7 +21,6 @@
 
 #include <string.h>
 #include "mbbiRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)

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)

src/devmbboStream.c

@@ -21,7 +21,6 @@
 
 #include <string.h>
 #include "mbboRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)

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

src/devstringinStream.c

@@ -19,7 +19,6 @@
 ***************************************************************/
 
 #include "stringinRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)

src/devstringoutStream.c

@@ -19,7 +19,6 @@
 ***************************************************************/
 
 #include "stringoutRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)

src/devwaveformStream.c

@@ -21,7 +21,6 @@
 #include <string.h>
 #include "errlog.h"
 #include "waveformRecord.h"
-#include "epicsExport.h"
 #include "devStream.h"
 
 static long readData(dbCommon *record, format_t *format)