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.
This commit is contained in:
Andrew Johnson
2013-11-20 16:21:10 -06:00
parent 570993e32b
commit 9ab6f89604
33 changed files with 54 additions and 27 deletions
-1
View File
@@ -31,7 +31,6 @@
#include "epicsString.h"
#include "epicsExport.h"
#define epicsExportSharedSymbols
#include "dbFldTypes.h"
#include "link.h"
#include "dbStaticLib.h"
+1 -1
View File
@@ -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 **********/
+1 -1
View File
@@ -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, ...);
+1 -2
View File
@@ -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 */
+1
View File
@@ -20,6 +20,7 @@
#include "callback.h"
#include "devSup.h"
#include "dbCommon.h"
#include "epicsExport.h"
static long addRec(struct dbCommon *prec)
+1 -1
View File
@@ -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 *);
+1
View File
@@ -41,6 +41,7 @@
#include "recGbl.h"
#include "cantProceed.h"
#include "menuYesNo.h"
#define GEN_SIZE_OFFSET
#include "aaiRecord.h"
#undef GEN_SIZE_OFFSET
+1
View File
@@ -41,6 +41,7 @@
#include "recGbl.h"
#include "cantProceed.h"
#include "menuYesNo.h"
#define GEN_SIZE_OFFSET
#include "aaoRecord.h"
#undef GEN_SIZE_OFFSET
+1
View File
@@ -36,6 +36,7 @@
#include "recGbl.h"
#include "special.h"
#include "menuConvert.h"
#define GEN_SIZE_OFFSET
#include "aiRecord.h"
#undef GEN_SIZE_OFFSET
+2 -1
View File
@@ -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*/
+2
View File
@@ -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
+4 -3
View File
@@ -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*/
+1
View File
@@ -32,6 +32,7 @@
#include "recSup.h"
#include "recGbl.h"
#include "special.h"
#define GEN_SIZE_OFFSET
#include "calcRecord.h"
#undef GEN_SIZE_OFFSET
+2 -2
View File
@@ -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
+1
View File
@@ -31,6 +31,7 @@
#include "special.h"
#include "recSup.h"
#include "recGbl.h"
#define GEN_SIZE_OFFSET
#include "compressRecord.h"
#undef GEN_SIZE_OFFSET
+1
View File
@@ -38,6 +38,7 @@
#include "recGbl.h"
#include "special.h"
#include "menuOmsl.h"
#define GEN_SIZE_OFFSET
#include "dfanoutRecord.h"
#undef GEN_SIZE_OFFSET
+1
View File
@@ -33,6 +33,7 @@
#include "recSup.h"
#include "recGbl.h"
#include "menuYesNo.h"
#define GEN_SIZE_OFFSET
#include "eventRecord.h"
#undef GEN_SIZE_OFFSET
+1
View File
@@ -29,6 +29,7 @@
#include "recSup.h"
#include "recGbl.h"
#include "dbCommon.h"
#define GEN_SIZE_OFFSET
#include "fanoutRecord.h"
#undef GEN_SIZE_OFFSET
+1
View File
@@ -37,6 +37,7 @@
#include "recSup.h"
#include "recGbl.h"
#include "menuYesNo.h"
#define GEN_SIZE_OFFSET
#include "histogramRecord.h"
#undef GEN_SIZE_OFFSET
+1
View File
@@ -32,6 +32,7 @@
#include "recSup.h"
#include "recGbl.h"
#include "menuYesNo.h"
#define GEN_SIZE_OFFSET
#include "longinRecord.h"
#undef GEN_SIZE_OFFSET
+4 -3
View File
@@ -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
+1
View File
@@ -34,6 +34,7 @@
#include "recSup.h"
#include "recGbl.h"
#include "special.h"
#define GEN_SIZE_OFFSET
#include "mbbiDirectRecord.h"
#undef GEN_SIZE_OFFSET
+2
View File
@@ -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
+4 -3
View File
@@ -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*/
+4 -3
View File
@@ -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*/
+1
View File
@@ -29,6 +29,7 @@
#include "errMdef.h"
#include "recSup.h"
#include "recGbl.h"
#define GEN_SIZE_OFFSET
#include "permissiveRecord.h"
#undef GEN_SIZE_OFFSET
+1
View File
@@ -31,6 +31,7 @@
#include "errMdef.h"
#include "recSup.h"
#include "recGbl.h"
#define GEN_SIZE_OFFSET
#include "selRecord.h"
#undef GEN_SIZE_OFFSET
+1
View File
@@ -30,6 +30,7 @@
#include "errMdef.h"
#include "recSup.h"
#include "recGbl.h"
#define GEN_SIZE_OFFSET
#include "stateRecord.h"
#undef GEN_SIZE_OFFSET
+2 -1
View File
@@ -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
+5 -4
View File
@@ -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
+1
View File
@@ -37,6 +37,7 @@
#include "recSup.h"
#include "recGbl.h"
#include "cantProceed.h"
#define GEN_SIZE_OFFSET
#include "subArrayRecord.h"
#undef GEN_SIZE_OFFSET
+1
View File
@@ -35,6 +35,7 @@
#include "recSup.h"
#include "recGbl.h"
#include "special.h"
#define GEN_SIZE_OFFSET
#include "subRecord.h"
#undef GEN_SIZE_OFFSET
+2 -1
View File
@@ -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