cleanup header usage for windows

src/StreamBuffer.h

@@ -22,7 +22,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-
 #include <sys/types.h>
 
 #ifndef __GNUC__

src/StreamBusInterface.h

@@ -21,7 +21,7 @@
 #define StreamBusInterface_h
 
 #include <stddef.h>
-#include <StreamBuffer.h>
+#include "StreamBuffer.h"
 
 enum StreamIoStatus {
     StreamIoSuccess, StreamIoTimeout, StreamIoNoReply,

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 <symLib.h>
 #include <sysSymTbl.h>

src/StreamProtocol.h

@@ -21,8 +21,8 @@
 #ifndef StreamProtocol_h
 #define StreamProtocol_h
 
-#include "StreamBuffer.h"
 #include <stdio.h>
+#include "StreamBuffer.h"
 
 enum FormatType {NoFormat, ScanFormat, PrintFormat};
 

src/devStream.h

@@ -49,11 +49,6 @@
 extern "C" {
 #endif
 
-#ifdef epicsExportSharedSymbols
-#   define devStream_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include <stdio.h>
 #include <dbCommon.h>
 #include <dbScan.h>
@@ -61,15 +56,13 @@ extern "C" {
 /* #include <dbFldTypes.h> */
 #include <dbAccess.h>
 
-#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;

src/devaaiStream.c

@@ -20,10 +20,10 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <errlog.h>
+#include "errlog.h"
-#include <aaiRecord.h>
+#include "aaiRecord.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

src/devaaoStream.c

@@ -20,10 +20,10 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <errlog.h>
+#include "errlog.h"
-#include <aaoRecord.h>
+#include "aaoRecord.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

src/devaiStream.c

@@ -19,11 +19,11 @@
 ***************************************************************/
 
 #include <math.h>
-#include <epicsMath.h>
+#include "epicsMath.h"
-#include <menuConvert.h>
+#include "menuConvert.h"
-#include <aiRecord.h>
+#include "aiRecord.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

src/devaoStream.c

@@ -18,10 +18,10 @@
 *                                                              *
 ***************************************************************/
 
-#include <menuConvert.h>
+#include "menuConvert.h"
-#include <aoRecord.h>
+#include "aoRecord.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

src/devbiStream.c

@@ -19,9 +19,9 @@
 ***************************************************************/
 
 #include <string.h>
-#include <biRecord.h>
+#include "biRecord.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

src/devboStream.c

@@ -19,9 +19,9 @@
 ***************************************************************/
 
 #include <string.h>
-#include <boRecord.h>
+#include "boRecord.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

src/devcalcoutStream.c

@@ -17,10 +17,10 @@
 *                                                              *
 ***************************************************************/
 
-#include <postfix.h>
+#include "postfix.h"
-#include <calcoutRecord.h>
+#include "calcoutRecord.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

src/devlonginStream.c

@@ -18,9 +18,9 @@
 *                                                              *
 ***************************************************************/
 
-#include <longinRecord.h>
+#include "longinRecord.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

src/devlongoutStream.c

@@ -19,9 +19,9 @@
 *                                                              *
 ***************************************************************/
 
-#include <longoutRecord.h>
+#include "longoutRecord.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

src/devmbbiDirectStream.c

@@ -19,9 +19,9 @@
 *                                                              *
 ***************************************************************/
 
-#include <mbbiDirectRecord.h>
+#include "mbbiDirectRecord.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

src/devmbbiStream.c

@@ -20,9 +20,9 @@
 ***************************************************************/
 
 #include <string.h>
-#include <mbbiRecord.h>
+#include "mbbiRecord.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

src/devmbboDirectStream.c

@@ -19,10 +19,10 @@
 *                                                              *
 ***************************************************************/
 
-#include <mbboDirectRecord.h>
+#include "mbboDirectRecord.h"
 #include "alarm.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

src/devmbboStream.c

@@ -20,9 +20,9 @@
 ***************************************************************/
 
 #include <string.h>
-#include <mbboRecord.h>
+#include "mbboRecord.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

src/devstringinStream.c

@@ -18,9 +18,9 @@
 *                                                              *
 ***************************************************************/
 
-#include <stringinRecord.h>
+#include "stringinRecord.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

src/devstringoutStream.c

@@ -18,9 +18,9 @@
 *                                                              *
 ***************************************************************/
 
-#include <stringoutRecord.h>
+#include "stringoutRecord.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

src/devwaveformStream.c

@@ -19,10 +19,10 @@
 ***************************************************************/
 
 #include <string.h>
-#include <errlog.h>
+#include "errlog.h"
-#include <waveformRecord.h>
+#include "waveformRecord.h"
+#include "epicsExport.h"
 #include "devStream.h"
-#include <epicsExport.h>
 
 static long readData (dbCommon *record, format_t *format)
 {

srcSynApps/devscalcoutStream.c

@@ -17,9 +17,9 @@
 *                                                              *
 ***************************************************************/
 
-#include <devStream.h>
+#include "sCalcoutRecord.h"
-#include <sCalcoutRecord.h>
+#include "epicsExport.h"
-#include <epicsExport.h>
+#include "devStream.h"
 
 /* scalcout record has a bug: it never calls init_record
    of the device support.

streamApp/streamAppMain.cc

@@ -17,9 +17,9 @@
 *                                                              *
 ***************************************************************/
 
-#include <epicsThread.h>
+#include "epicsThread.h"
-#include <iocsh.h>
+#include "iocsh.h"
-#include <devStream.h>
+#include "devStream.h"
 
 int main(int argc,char *argv[])
 {