From 9ab6f8960445e01a7e39c419ea07a7a7c5ad3407 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Wed, 20 Nov 2013 16:21:10 -0600
Subject: [PATCH] Clean up epicsExport.h includes

Mostly in record and device support, this commit puts
the include in the right place and moves some other
includes around to get the order right.
---
 src/dbStatic/dbLexRoutines.c     | 1 -
 src/dev/softDev/devGeneralTime.c | 2 +-
 src/dev/softDev/devSoStdio.c     | 2 +-
 src/dev/softDev/devTimestamp.c   | 3 +--
 src/dev/testDev/devTestAsyn.c    | 1 +
 src/rec/aSubRecord.c             | 2 +-
 src/rec/aaiRecord.c              | 1 +
 src/rec/aaoRecord.c              | 1 +
 src/rec/aiRecord.c               | 1 +
 src/rec/aoRecord.c               | 3 ++-
 src/rec/biRecord.c               | 2 ++
 src/rec/boRecord.c               | 7 ++++---
 src/rec/calcRecord.c             | 1 +
 src/rec/calcoutRecord.c          | 4 ++--
 src/rec/compressRecord.c         | 1 +
 src/rec/dfanoutRecord.c          | 1 +
 src/rec/eventRecord.c            | 1 +
 src/rec/fanoutRecord.c           | 1 +
 src/rec/histogramRecord.c        | 1 +
 src/rec/longinRecord.c           | 1 +
 src/rec/longoutRecord.c          | 7 ++++---
 src/rec/mbbiDirectRecord.c       | 1 +
 src/rec/mbbiRecord.c             | 2 ++
 src/rec/mbboDirectRecord.c       | 7 ++++---
 src/rec/mbboRecord.c             | 7 ++++---
 src/rec/permissiveRecord.c       | 1 +
 src/rec/selRecord.c              | 1 +
 src/rec/stateRecord.c            | 1 +
 src/rec/stringinRecord.c         | 3 ++-
 src/rec/stringoutRecord.c        | 9 +++++----
 src/rec/subArrayRecord.c         | 1 +
 src/rec/subRecord.c              | 1 +
 src/rec/waveformRecord.c         | 3 ++-
 33 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/src/dbStatic/dbLexRoutines.c b/src/dbStatic/dbLexRoutines.c
index 3620cc7b9..9932dceae 100644
--- a/src/dbStatic/dbLexRoutines.c
+++ b/src/dbStatic/dbLexRoutines.c
@@ -31,7 +31,6 @@
 #include "epicsString.h"
 #include "epicsExport.h"
 
-#define epicsExportSharedSymbols
 #include "dbFldTypes.h"
 #include "link.h"
 #include "dbStaticLib.h"
diff --git a/src/dev/softDev/devGeneralTime.c b/src/dev/softDev/devGeneralTime.c
index 4c42a80f4..c656c85db 100644
--- a/src/dev/softDev/devGeneralTime.c
+++ b/src/dev/softDev/devGeneralTime.c
@@ -24,12 +24,12 @@
 #include "devSup.h"
 #include "epicsString.h"
 #include "epicsGeneralTime.h"
-#include "epicsExport.h"
 
 #include "aiRecord.h"
 #include "boRecord.h"
 #include "longinRecord.h"
 #include "stringinRecord.h"
+#include "epicsExport.h"
 
 
 /********* ai record **********/
diff --git a/src/dev/softDev/devSoStdio.c b/src/dev/softDev/devSoStdio.c
index c720f7e4e..684dab178 100644
--- a/src/dev/softDev/devSoStdio.c
+++ b/src/dev/softDev/devSoStdio.c
@@ -15,9 +15,9 @@
 #include "errlog.h"
 #include "recGbl.h"
 #include "recSup.h"
-#include "epicsExport.h"
 
 #include "stringoutRecord.h"
+#include "epicsExport.h"
 
 typedef int (*PRINTFFUNC)(const char *fmt, ...);
 
diff --git a/src/dev/softDev/devTimestamp.c b/src/dev/softDev/devTimestamp.c
index f8de440c4..b7e2c7e1a 100644
--- a/src/dev/softDev/devTimestamp.c
+++ b/src/dev/softDev/devTimestamp.c
@@ -17,11 +17,10 @@
 #include "alarm.h"
 #include "devSup.h"
 #include "recGbl.h"
-#include "epicsExport.h"
 
 #include "aiRecord.h"
 #include "stringinRecord.h"
-
+#include "epicsExport.h"
 
 /* Extended device support to allow INP field changes */
 
diff --git a/src/dev/testDev/devTestAsyn.c b/src/dev/testDev/devTestAsyn.c
index 52adcd39e..4b1d8a5e9 100644
--- a/src/dev/testDev/devTestAsyn.c
+++ b/src/dev/testDev/devTestAsyn.c
@@ -20,6 +20,7 @@
 #include "callback.h"
 #include "devSup.h"
 #include "dbCommon.h"
+
 #include "epicsExport.h"
 
 static long addRec(struct dbCommon *prec)
diff --git a/src/rec/aSubRecord.c b/src/rec/aSubRecord.c
index fd96ede20..ccf4af9bd 100644
--- a/src/rec/aSubRecord.c
+++ b/src/rec/aSubRecord.c
@@ -32,12 +32,12 @@
 #include "devSup.h"
 #include "special.h"
 #include "registryFunction.h"
-#include "epicsExport.h"
 #include "recGbl.h"
 
 #define GEN_SIZE_OFFSET
 #include "aSubRecord.h"
 #undef  GEN_SIZE_OFFSET
+#include "epicsExport.h"
 
 
 typedef long (*GENFUNCPTR)(struct aSubRecord *);
diff --git a/src/rec/aaiRecord.c b/src/rec/aaiRecord.c
index 5c88791c4..04797fd1c 100644
--- a/src/rec/aaiRecord.c
+++ b/src/rec/aaiRecord.c
@@ -41,6 +41,7 @@
 #include "recGbl.h"
 #include "cantProceed.h"
 #include "menuYesNo.h"
+
 #define GEN_SIZE_OFFSET
 #include "aaiRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/aaoRecord.c b/src/rec/aaoRecord.c
index 695f8e1b1..318e29d3c 100644
--- a/src/rec/aaoRecord.c
+++ b/src/rec/aaoRecord.c
@@ -41,6 +41,7 @@
 #include "recGbl.h"
 #include "cantProceed.h"
 #include "menuYesNo.h"
+
 #define GEN_SIZE_OFFSET
 #include "aaoRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/aiRecord.c b/src/rec/aiRecord.c
index e6977005f..57ea32163 100644
--- a/src/rec/aiRecord.c
+++ b/src/rec/aiRecord.c
@@ -36,6 +36,7 @@
 #include "recGbl.h"
 #include "special.h"
 #include "menuConvert.h"
+
 #define GEN_SIZE_OFFSET
 #include "aiRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/aoRecord.c b/src/rec/aoRecord.c
index bce43e3e4..e4fb7e533 100644
--- a/src/rec/aoRecord.c
+++ b/src/rec/aoRecord.c
@@ -37,10 +37,11 @@
 #include "menuConvert.h"
 #include "menuOmsl.h"
 #include "menuYesNo.h"
+#include "menuIvoa.h"
+
 #define GEN_SIZE_OFFSET
 #include "aoRecord.h"
 #undef  GEN_SIZE_OFFSET
-#include "menuIvoa.h"
 #include "epicsExport.h"
 
 /* Create RSET - Record Support Entry Table*/
diff --git a/src/rec/biRecord.c b/src/rec/biRecord.c
index b58bb65d5..1ba7b129b 100644
--- a/src/rec/biRecord.c
+++ b/src/rec/biRecord.c
@@ -34,10 +34,12 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "special.h"
+
 #define GEN_SIZE_OFFSET
 #include "biRecord.h"
 #undef  GEN_SIZE_OFFSET
 #include "epicsExport.h"
+
 /* Create RSET - Record Support Entry Table*/
 #define report NULL
 #define initialize NULL
diff --git a/src/rec/boRecord.c b/src/rec/boRecord.c
index 5248bd661..ee21ce56d 100644
--- a/src/rec/boRecord.c
+++ b/src/rec/boRecord.c
@@ -33,12 +33,13 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "special.h"
-#define GEN_SIZE_OFFSET
-#include "boRecord.h"
-#undef  GEN_SIZE_OFFSET
 #include "menuIvoa.h"
 #include "menuOmsl.h"
 #include "menuYesNo.h"
+
+#define GEN_SIZE_OFFSET
+#include "boRecord.h"
+#undef  GEN_SIZE_OFFSET
 #include "epicsExport.h"
 
 /* Create RSET - Record Support Entry Table*/
diff --git a/src/rec/calcRecord.c b/src/rec/calcRecord.c
index 8accf60d9..1bff7b85f 100644
--- a/src/rec/calcRecord.c
+++ b/src/rec/calcRecord.c
@@ -32,6 +32,7 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "special.h"
+
 #define GEN_SIZE_OFFSET
 #include "calcRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/calcoutRecord.c b/src/rec/calcoutRecord.c
index 89265f3cc..37951f32f 100644
--- a/src/rec/calcoutRecord.c
+++ b/src/rec/calcoutRecord.c
@@ -36,13 +36,13 @@
 #include "special.h"
 #include "callback.h"
 #include "taskwd.h"
+#include "menuIvoa.h"
 
 #define GEN_SIZE_OFFSET
 #include "calcoutRecord.h"
 #undef  GEN_SIZE_OFFSET
-#include "menuIvoa.h"
 #include "epicsExport.h"
-
+
 /* Create RSET - Record Support Entry Table*/
 #define report NULL
 #define initialize NULL
diff --git a/src/rec/compressRecord.c b/src/rec/compressRecord.c
index 2879852d8..d0539b218 100644
--- a/src/rec/compressRecord.c
+++ b/src/rec/compressRecord.c
@@ -31,6 +31,7 @@
 #include "special.h"
 #include "recSup.h"
 #include "recGbl.h"
+
 #define GEN_SIZE_OFFSET
 #include "compressRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/dfanoutRecord.c b/src/rec/dfanoutRecord.c
index 723d1a59c..382c5a46f 100644
--- a/src/rec/dfanoutRecord.c
+++ b/src/rec/dfanoutRecord.c
@@ -38,6 +38,7 @@
 #include "recGbl.h"
 #include "special.h"
 #include "menuOmsl.h"
+
 #define GEN_SIZE_OFFSET
 #include "dfanoutRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/eventRecord.c b/src/rec/eventRecord.c
index b8cc2b208..9977640f0 100644
--- a/src/rec/eventRecord.c
+++ b/src/rec/eventRecord.c
@@ -33,6 +33,7 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "menuYesNo.h"
+
 #define GEN_SIZE_OFFSET
 #include "eventRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/fanoutRecord.c b/src/rec/fanoutRecord.c
index 1b11056a3..4a76b9ddd 100644
--- a/src/rec/fanoutRecord.c
+++ b/src/rec/fanoutRecord.c
@@ -29,6 +29,7 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "dbCommon.h"
+
 #define GEN_SIZE_OFFSET
 #include "fanoutRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/histogramRecord.c b/src/rec/histogramRecord.c
index e78be26c5..f794f315c 100644
--- a/src/rec/histogramRecord.c
+++ b/src/rec/histogramRecord.c
@@ -37,6 +37,7 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "menuYesNo.h"
+
 #define GEN_SIZE_OFFSET
 #include "histogramRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/longinRecord.c b/src/rec/longinRecord.c
index 011b6c882..176b3b5e0 100644
--- a/src/rec/longinRecord.c
+++ b/src/rec/longinRecord.c
@@ -32,6 +32,7 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "menuYesNo.h"
+
 #define GEN_SIZE_OFFSET
 #include "longinRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/longoutRecord.c b/src/rec/longoutRecord.c
index d7d53d44f..ce0ab80d7 100644
--- a/src/rec/longoutRecord.c
+++ b/src/rec/longoutRecord.c
@@ -29,13 +29,14 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "menuYesNo.h"
+#include "menuIvoa.h"
+#include "menuOmsl.h"
+
 #define GEN_SIZE_OFFSET
 #include "longoutRecord.h"
 #undef  GEN_SIZE_OFFSET
-#include "menuIvoa.h"
-#include "menuOmsl.h"
 #include "epicsExport.h"
-
+
 /* Create RSET - Record Support Entry Table*/
 #define report NULL
 #define initialize NULL
diff --git a/src/rec/mbbiDirectRecord.c b/src/rec/mbbiDirectRecord.c
index e8942a75f..f6591e274 100644
--- a/src/rec/mbbiDirectRecord.c
+++ b/src/rec/mbbiDirectRecord.c
@@ -34,6 +34,7 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "special.h"
+
 #define GEN_SIZE_OFFSET
 #include "mbbiDirectRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/mbbiRecord.c b/src/rec/mbbiRecord.c
index 6a1ef943d..0a07ba1a1 100644
--- a/src/rec/mbbiRecord.c
+++ b/src/rec/mbbiRecord.c
@@ -32,10 +32,12 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "special.h"
+
 #define GEN_SIZE_OFFSET
 #include "mbbiRecord.h"
 #undef  GEN_SIZE_OFFSET
 #include "epicsExport.h"
+
 /* Create RSET - Record Support Entry Table*/
 #define report NULL
 #define initialize NULL
diff --git a/src/rec/mbboDirectRecord.c b/src/rec/mbboDirectRecord.c
index 3d3a419f0..8ec8a3acd 100644
--- a/src/rec/mbboDirectRecord.c
+++ b/src/rec/mbboDirectRecord.c
@@ -32,12 +32,13 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "special.h"
-#define GEN_SIZE_OFFSET
-#include "mbboDirectRecord.h"
-#undef  GEN_SIZE_OFFSET
 #include "menuOmsl.h"
 #include "menuIvoa.h"
 #include "menuYesNo.h"
+
+#define GEN_SIZE_OFFSET
+#include "mbboDirectRecord.h"
+#undef  GEN_SIZE_OFFSET
 #include "epicsExport.h"
 
 /* Create RSET - Record Support Entry Table*/
diff --git a/src/rec/mbboRecord.c b/src/rec/mbboRecord.c
index 5df97ff07..79a3c8227 100644
--- a/src/rec/mbboRecord.c
+++ b/src/rec/mbboRecord.c
@@ -33,12 +33,13 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "special.h"
-#define GEN_SIZE_OFFSET
-#include "mbboRecord.h"
-#undef  GEN_SIZE_OFFSET
 #include "menuOmsl.h"
 #include "menuIvoa.h"
 #include "menuYesNo.h"
+
+#define GEN_SIZE_OFFSET
+#include "mbboRecord.h"
+#undef  GEN_SIZE_OFFSET
 #include "epicsExport.h"
 
 /* Create RSET - Record Support Entry Table*/
diff --git a/src/rec/permissiveRecord.c b/src/rec/permissiveRecord.c
index a1d96d151..65077253a 100644
--- a/src/rec/permissiveRecord.c
+++ b/src/rec/permissiveRecord.c
@@ -29,6 +29,7 @@
 #include "errMdef.h"
 #include "recSup.h"
 #include "recGbl.h"
+
 #define GEN_SIZE_OFFSET
 #include "permissiveRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/selRecord.c b/src/rec/selRecord.c
index 6174dab3d..52f22b74b 100644
--- a/src/rec/selRecord.c
+++ b/src/rec/selRecord.c
@@ -31,6 +31,7 @@
 #include "errMdef.h"
 #include "recSup.h"
 #include "recGbl.h"
+
 #define GEN_SIZE_OFFSET
 #include "selRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/stateRecord.c b/src/rec/stateRecord.c
index 193d7ca51..b295ccbb7 100644
--- a/src/rec/stateRecord.c
+++ b/src/rec/stateRecord.c
@@ -30,6 +30,7 @@
 #include "errMdef.h"
 #include "recSup.h"
 #include "recGbl.h"
+
 #define GEN_SIZE_OFFSET
 #include "stateRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/stringinRecord.c b/src/rec/stringinRecord.c
index bff03b4fc..02f454788 100644
--- a/src/rec/stringinRecord.c
+++ b/src/rec/stringinRecord.c
@@ -33,11 +33,12 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "menuYesNo.h"
+
 #define GEN_SIZE_OFFSET
 #include "stringinRecord.h"
 #undef  GEN_SIZE_OFFSET
 #include "epicsExport.h"
-
+
 /* Create RSET - Record Support Entry Table*/
 #define report NULL
 #define initialize NULL
diff --git a/src/rec/stringoutRecord.c b/src/rec/stringoutRecord.c
index 1555f5b61..64532a601 100644
--- a/src/rec/stringoutRecord.c
+++ b/src/rec/stringoutRecord.c
@@ -32,14 +32,15 @@
 #include "errMdef.h"
 #include "recSup.h"
 #include "recGbl.h"
-#define GEN_SIZE_OFFSET
-#include "stringoutRecord.h"
-#undef  GEN_SIZE_OFFSET
 #include "menuOmsl.h"
 #include "menuIvoa.h"
 #include "menuYesNo.h"
+
+#define GEN_SIZE_OFFSET
+#include "stringoutRecord.h"
+#undef  GEN_SIZE_OFFSET
 #include "epicsExport.h"
-
+
 /* Create RSET - Record Support Entry Table*/
 #define report NULL
 #define initialize NULL
diff --git a/src/rec/subArrayRecord.c b/src/rec/subArrayRecord.c
index dc18a6ad3..d24eb77dd 100644
--- a/src/rec/subArrayRecord.c
+++ b/src/rec/subArrayRecord.c
@@ -37,6 +37,7 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "cantProceed.h"
+
 #define GEN_SIZE_OFFSET
 #include "subArrayRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/subRecord.c b/src/rec/subRecord.c
index b16a89c3c..dd31e4ab5 100644
--- a/src/rec/subRecord.c
+++ b/src/rec/subRecord.c
@@ -35,6 +35,7 @@
 #include "recSup.h"
 #include "recGbl.h"
 #include "special.h"
+
 #define GEN_SIZE_OFFSET
 #include "subRecord.h"
 #undef  GEN_SIZE_OFFSET
diff --git a/src/rec/waveformRecord.c b/src/rec/waveformRecord.c
index 6cd7a05b4..918a7b0a9 100644
--- a/src/rec/waveformRecord.c
+++ b/src/rec/waveformRecord.c
@@ -23,6 +23,7 @@
 
 #include "dbDefs.h"
 #include "epicsPrint.h"
+#include "epicsString.h"
 #include "alarm.h"
 #include "dbAccess.h"
 #include "dbEvent.h"
@@ -34,11 +35,11 @@
 #include "recGbl.h"
 #include "cantProceed.h"
 #include "menuYesNo.h"
+
 #define GEN_SIZE_OFFSET
 #include "waveformRecord.h"
 #undef  GEN_SIZE_OFFSET
 #include "epicsExport.h"
-#include "epicsString.h"
 
 /* Create RSET - Record Support Entry Table*/
 #define report NULL