From 4bfe2bf8ee38fc40aaa8f44a078f3d7d470efa5f Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Tue, 20 Jan 1998 16:20:07 +0000
Subject: [PATCH] Fix include statements

---
 src/db/dbBkpt.c         | 36 ++++++++++++++++++++----------------
 src/db/dbCa.c           |  2 ++
 src/db/dbConvert.c      | 20 +++++++++++---------
 src/db/dbEvent.c        |  3 ++-
 src/db/dbFastLinkConv.c | 33 +++++++++++++++++----------------
 src/db/dbLock.c         | 22 +++++++++++-----------
 src/db/dbNotify.c       | 21 +++++++++++----------
 src/db/dbScan.c         | 32 ++++++++++++++++----------------
 src/db/dbTest.c         | 33 +++++++++++++++++----------------
 src/db/db_access.c      | 19 +++++++++++--------
 src/db/db_test.c        |  6 ++++--
 src/db/dbcar.c          |  1 +
 src/db/devLib.c         |  6 ++++--
 src/db/drvTS.c          |  5 +++++
 src/db/recGbl.c         | 22 +++++++++++-----------
 src/db/taskwd.c         | 11 ++++++-----
 src/vxWorks/db/devLib.c |  6 ++++--
 src/vxWorks/db/drvTS.c  |  5 +++++
 18 files changed, 158 insertions(+), 125 deletions(-)

diff --git a/src/db/dbBkpt.c b/src/db/dbBkpt.c
index afb5d7e9f..a4e53f55a 100644
--- a/src/db/dbBkpt.c
+++ b/src/db/dbBkpt.c
@@ -28,6 +28,9 @@
  * Modification Log:
  * -----------------
  *  $Log$
+ *  Revision 1.8  1996/08/05 19:33:40  jhill
+ *  removed ; from if
+ *
  *  Revision 1.7  1996/04/22 14:30:38  mrk
  *  Changes for dynamic link modification
  *
@@ -75,22 +78,23 @@
 #include	<tickLib.h>
 #include	<sysLib.h>
 
-#include	<fast_lock.h>
-#include	<alarm.h>
-#include	<dbDefs.h>
-#include	<dbBase.h>
-#include	<dbAccess.h>
-#include	<dbScan.h>
-#include	<dbCommon.h>
-#include	<dbLock.h>
-#include	<dbFldTypes.h>
-#include	<dbBkpt.h>
-#include	<db_field_log.h>
-#include	<errMdef.h>
-#include	<recSup.h>
-#include	<recGbl.h>
-#include	<special.h>
-#include        <task_params.h>
+#include	"dbDefs.h"
+#include	"errlog.h"
+#include	"fast_lock.h"
+#include	"alarm.h"
+#include	"dbBase.h"
+#include	"dbAccess.h"
+#include	"dbScan.h"
+#include	"dbCommon.h"
+#include	"dbLock.h"
+#include	"dbFldTypes.h"
+#include	"dbBkpt.h"
+#include	"db_field_log.h"
+#include	"errMdef.h"
+#include	"recSup.h"
+#include	"recGbl.h"
+#include	"special.h"
+#include        "task_params.h"
 
 /* private routines */
 static void dbBkptCont();
diff --git a/src/db/dbCa.c b/src/db/dbCa.c
index 6fddace33..5ff3641ee 100644
--- a/src/db/dbCa.c
+++ b/src/db/dbCa.c
@@ -31,6 +31,8 @@ of this distribution.
 #include <errno.h>
 #include <taskLib.h>
 
+#include "dbDefs.h"
+#include "errlog.h"
 #include "cadef.h"
 #include "caerr.h"
 #include "alarm.h"
diff --git a/src/db/dbConvert.c b/src/db/dbConvert.c
index c9807d7b8..1e6f0a497 100644
--- a/src/db/dbConvert.c
+++ b/src/db/dbConvert.c
@@ -35,15 +35,17 @@
 #include	<stdio.h>
 #include	<string.h>
 
-#include	<cvtFast.h>
-#include	<dbBase.h>
-#include	<dbAccess.h>
-#include	<dbConvert.h>
-#include	<dbStaticLib.h>
-#include	<dbFldTypes.h>
-#include	<errMdef.h>
-#include	<recSup.h>
-#include	<recGbl.h>
+#include	"dbDefs.h"
+#include	"errlog.h"
+#include	"cvtFast.h"
+#include	"dbBase.h"
+#include	"dbAccess.h"
+#include	"dbConvert.h"
+#include	"dbStaticLib.h"
+#include	"dbFldTypes.h"
+#include	"errMdef.h"
+#include	"recSup.h"
+#include	"recGbl.h"
 
 /* DATABASE ACCESS GET CONVERSION SUPPORT */
 
diff --git a/src/db/dbEvent.c b/src/db/dbEvent.c
index 586cc7211..0d3638a84 100644
--- a/src/db/dbEvent.c
+++ b/src/db/dbEvent.c
@@ -78,10 +78,11 @@
 #include	<logLib.h>
 #include	<taskLib.h>
 
+#include	"dbDefs.h"
+#include	"errlog.h"
 #include	"taskwd.h"
 #include	"freeList.h"
 #include 	"tsDefs.h"
-#include	"dbDefs.h"
 #include	"dbCommon.h"
 #include	"task_params.h"
 #include	"dbAccess.h"
diff --git a/src/db/dbFastLinkConv.c b/src/db/dbFastLinkConv.c
index 588ea6695..e9ee8b112 100644
--- a/src/db/dbFastLinkConv.c
+++ b/src/db/dbFastLinkConv.c
@@ -38,22 +38,23 @@
 #include        <vxLib.h>
 #include        <tickLib.h>
  
-#include        <fast_lock.h>
-#include        <cvtFast.h>
-#include        <alarm.h>
-#include        <dbDefs.h>
-#include        <dbBase.h>
-#include        <dbAccess.h>
-#include        <dbConvert.h>
-#include        <dbStaticLib.h>
-#include        <dbScan.h>
-#include        <dbCommon.h>
-#include        <dbFldTypes.h>
-#include        <db_field_log.h>
-#include        <errMdef.h>
-#include        <recSup.h>
-#include        <recGbl.h>
-#include        <special.h>
+#include        "dbDefs.h"
+#include        "errlog.h"
+#include        "fast_lock.h"
+#include        "cvtFast.h"
+#include        "alarm.h"
+#include        "dbBase.h"
+#include        "dbAccess.h"
+#include        "dbConvert.h"
+#include        "dbStaticLib.h"
+#include        "dbScan.h"
+#include        "dbCommon.h"
+#include        "dbFldTypes.h"
+#include        "db_field_log.h"
+#include        "errMdef.h"
+#include        "recSup.h"
+#include        "recGbl.h"
+#include        "special.h"
  
 extern struct dbBase *pdbbase;
 
diff --git a/src/db/dbLock.c b/src/db/dbLock.c
index 84c981d19..685649b05 100644
--- a/src/db/dbLock.c
+++ b/src/db/dbLock.c
@@ -70,17 +70,17 @@ since this will delay all other tasks.
 #include	<sysLib.h>
 #include	<taskLib.h>
 
-#include	<dbDefs.h>
-#include	<dbBase.h>
-#include	<ellLib.h>
-#include	<dbAccess.h>
-#include	<dbStaticLib.h>
-#include	<dbConvert.h>
-#include	<dbCommon.h>
-#include	<dbLock.h>
-#include	<epicsPrint.h>
-#include	<dbFldTypes.h>
-#include	<errMdef.h>
+#include	"dbDefs.h"
+#include	"dbBase.h"
+#include	"ellLib.h"
+#include	"dbAccess.h"
+#include	"dbStaticLib.h"
+#include	"dbConvert.h"
+#include	"dbCommon.h"
+#include	"dbLock.h"
+#include	"epicsPrint.h"
+#include	"dbFldTypes.h"
+#include	"errMdef.h"
 
 #define STATIC static
 
diff --git a/src/db/dbNotify.c b/src/db/dbNotify.c
index 5041b91a6..53c432aa8 100644
--- a/src/db/dbNotify.c
+++ b/src/db/dbNotify.c
@@ -40,16 +40,17 @@
 #include	<semLib.h>
 #include	<sysLib.h>
 
-#include	<dbDefs.h>
-#include	<fast_lock.h>
-#include	<dbBase.h>
-#include	<dbAccess.h>
-#include	<dbStaticLib.h>
-#include	<dbScan.h>
-#include	<dbCommon.h>
-#include	<errMdef.h>
-#include	<ellLib.h>
-#include	<recGbl.h>
+#include	"dbDefs.h"
+#include	"errlog.h"
+#include	"fast_lock.h"
+#include	"dbBase.h"
+#include	"dbAccess.h"
+#include	"dbStaticLib.h"
+#include	"dbScan.h"
+#include	"dbCommon.h"
+#include	"errMdef.h"
+#include	"ellLib.h"
+#include	"recGbl.h"
 
 /*NODE structure attached to ppnn field of each record in list*/
 typedef struct {
diff --git a/src/db/dbScan.c b/src/db/dbScan.c
index cbd461282..b8ef05d6d 100644
--- a/src/db/dbScan.c
+++ b/src/db/dbScan.c
@@ -54,22 +54,22 @@
 #include 	<sysLib.h>
 #include 	<intLib.h>
 
-#include	<dbDefs.h>
-#include	<epicsPrint.h>
-#include	<dbBase.h>
-#include	<dbStaticLib.h>
-#include	<dbAccess.h>
-#include	<dbScan.h>
-#include	<taskwd.h>
-#include	<callback.h>
-#include	<dbBase.h>
-#include	<dbCommon.h>
-#include	<dbLock.h>
-#include	<devSup.h>
-#include	<recGbl.h>
-#include	<task_params.h>
-#include	<fast_lock.h>
-#include	<dbStaticLib.h>
+#include	"dbDefs.h"
+#include	"epicsPrint.h"
+#include	"dbBase.h"
+#include	"dbStaticLib.h"
+#include	"dbAccess.h"
+#include	"dbScan.h"
+#include	"taskwd.h"
+#include	"callback.h"
+#include	"dbBase.h"
+#include	"dbCommon.h"
+#include	"dbLock.h"
+#include	"devSup.h"
+#include	"recGbl.h"
+#include	"task_params.h"
+#include	"fast_lock.h"
+#include	"dbStaticLib.h"
 
 extern struct dbBase *pdbbase;
 
diff --git a/src/db/dbTest.c b/src/db/dbTest.c
index 540a31d77..3c6496057 100644
--- a/src/db/dbTest.c
+++ b/src/db/dbTest.c
@@ -67,22 +67,23 @@ int dbhcr(void);		/*Hardware Configuration Report*/
 /*for open and close*/
 #include <ioLib.h>
 
-#include <ellLib.h>
-#include <fast_lock.h>
-#include <dbDefs.h>
-#include <dbAccess.h>
-#include <dbBase.h>
-#include <dbCommon.h>
-#include <dbLock.h>
-#include <recSup.h>
-#include <devSup.h>
-#include <drvSup.h>
-#include <recGbl.h>
-#include <special.h>
-#include <dbStaticLib.h>
-#include <dbEvent.h>
-#include <ellLib.h>
-#include <callback.h>
+#include "dbDefs.h"
+#include "errlog.h"
+#include "ellLib.h"
+#include "fast_lock.h"
+#include "dbAccess.h"
+#include "dbBase.h"
+#include "dbCommon.h"
+#include "dbLock.h"
+#include "recSup.h"
+#include "devSup.h"
+#include "drvSup.h"
+#include "recGbl.h"
+#include "special.h"
+#include "dbStaticLib.h"
+#include "dbEvent.h"
+#include "ellLib.h"
+#include "callback.h"
 
 extern struct dbBase *pdbbase;
 
diff --git a/src/db/db_access.c b/src/db/db_access.c
index 1093b2cfd..ad738ce14 100644
--- a/src/db/db_access.c
+++ b/src/db/db_access.c
@@ -46,18 +46,21 @@
  ***/
 
 #include        <vxWorks.h>
-#include        <types.h>
-
+#include        <stddef.h>
+#include        <stdlib.h>
 #include        <stdarg.h>
 #include        <fioLib.h>
 #include        <string.h>
-#include        <dbDefs.h>
-#include        <dbAccess.h>
-#include        <dbCommon.h>
-#include        <errMdef.h>
-#include        <recSup.h>
+#include        <types.h>
 
-#include	<alarm.h>
+#include        "dbDefs.h"
+#include        "errlog.h"
+#include        "dbAccess.h"
+#include        "dbCommon.h"
+#include        "errMdef.h"
+#include        "recSup.h"
+
+#include	"alarm.h"
 
 #ifndef NULL
 #define NULL 0
diff --git a/src/db/db_test.c b/src/db/db_test.c
index 6962badc2..f1c8195d3 100644
--- a/src/db/db_test.c
+++ b/src/db/db_test.c
@@ -36,8 +36,10 @@
 #include	<vxWorks.h>
 #include	<stdlib.h>
 #include	<stdio.h>
-#include        <dbDefs.h>
-#include        <db_access.h>
+
+#include        "dbDefs.h"
+#include        "errlog.h"
+#include        "db_access.h"
 
 
 /* function declarations */
diff --git a/src/db/dbcar.c b/src/db/dbcar.c
index fd1a4aa9b..55c616bcf 100644
--- a/src/db/dbcar.c
+++ b/src/db/dbcar.c
@@ -39,6 +39,7 @@ of this distribution.
 #undef INVALID_DB_REQ
 /*end of conflicting definitions*/
 #include "cadef.h"
+#include "dbDefs.h"
 #include "epicsPrint.h"
 #include "dbCommon.h"
 #include "dbCa.h"
diff --git a/src/db/devLib.c b/src/db/devLib.c
index c4dfd951b..acbc19222 100644
--- a/src/db/devLib.c
+++ b/src/db/devLib.c
@@ -68,9 +68,11 @@ static char *sccsID = "@(#) $Id$";
 #include 	<stdioLib.h>
 #include	<stdlib.h>
 
-#include	<fast_lock.h>
+#include	"dbDefs.h"
+#include	"errlog.h"
+#include	"fast_lock.h"
 #define devLibGlobal
-#include	<devLib.h>
+#include	"devLib.h"
 
 
 LOCAL LIST addrAlloc[atLast];
diff --git a/src/db/drvTS.c b/src/db/drvTS.c
index 22a505313..64169e253 100644
--- a/src/db/drvTS.c
+++ b/src/db/drvTS.c
@@ -1,6 +1,9 @@
 
 /*
  * $Log$
+ * Revision 1.20  1997/05/30 13:17:21  mrk
+ * get rid of warning messages when using TS_1900_TO_*
+ *
  * Revision 1.19  1997/03/05 13:20:44  jbk
  * Fixed a bug in TSreport - printing of IP addresses was incorrect
  *
@@ -157,6 +160,8 @@ DEVELOPMENT CENTER AT ARGONNE NATIONAL LABORATORY (708-252-2000).
 #include <net/if.h>
 #include <envDefs.h>
 #include <envLib.h>
+
+#include <dbDefs.h>
 #include <epicsPrint.h>
 
 #include <errMdef.h>
diff --git a/src/db/recGbl.c b/src/db/recGbl.c
index 3fff19b24..a94a09a8e 100644
--- a/src/db/recGbl.c
+++ b/src/db/recGbl.c
@@ -47,17 +47,17 @@
 #include	<stdioLib.h>
 #include	<strLib.h>
 
-#include	<dbDefs.h>
-#include	<dbBase.h>
-#include	<epicsPrint.h>
-#include	<dbEvent.h>
-#include	<dbAccess.h>
-#include	<dbConvert.h>
-#include	<dbScan.h>
-#include	<devSup.h>
-#include	<recGbl.h>
-#include	<dbCommon.h>
-#include	<drvTS.h>
+#include	"dbDefs.h"
+#include	"epicsPrint.h"
+#include	"dbBase.h"
+#include	"dbEvent.h"
+#include	"dbAccess.h"
+#include	"dbConvert.h"
+#include	"dbScan.h"
+#include	"devSup.h"
+#include	"recGbl.h"
+#include	"dbCommon.h"
+#include	"drvTS.h"
 
 
 /* local routines */
diff --git a/src/db/taskwd.c b/src/db/taskwd.c
index 1b9e72211..32d2be32d 100644
--- a/src/db/taskwd.c
+++ b/src/db/taskwd.c
@@ -40,11 +40,12 @@
 #include 	<taskLib.h>
 #include 	<sysLib.h>
 
-#include        <dbDefs.h>
-#include        <errMdef.h>
-#include        <taskwd.h>
-#include        <task_params.h>
-#include        <fast_lock.h>
+#include        "dbDefs.h"
+#include        "errlog.h"
+#include        "errMdef.h"
+#include        "taskwd.h"
+#include        "task_params.h"
+#include        "fast_lock.h"
 
 struct task_list {
 	ELLNODE		node;
diff --git a/src/vxWorks/db/devLib.c b/src/vxWorks/db/devLib.c
index c4dfd951b..acbc19222 100644
--- a/src/vxWorks/db/devLib.c
+++ b/src/vxWorks/db/devLib.c
@@ -68,9 +68,11 @@ static char *sccsID = "@(#) $Id$";
 #include 	<stdioLib.h>
 #include	<stdlib.h>
 
-#include	<fast_lock.h>
+#include	"dbDefs.h"
+#include	"errlog.h"
+#include	"fast_lock.h"
 #define devLibGlobal
-#include	<devLib.h>
+#include	"devLib.h"
 
 
 LOCAL LIST addrAlloc[atLast];
diff --git a/src/vxWorks/db/drvTS.c b/src/vxWorks/db/drvTS.c
index 22a505313..64169e253 100644
--- a/src/vxWorks/db/drvTS.c
+++ b/src/vxWorks/db/drvTS.c
@@ -1,6 +1,9 @@
 
 /*
  * $Log$
+ * Revision 1.20  1997/05/30 13:17:21  mrk
+ * get rid of warning messages when using TS_1900_TO_*
+ *
  * Revision 1.19  1997/03/05 13:20:44  jbk
  * Fixed a bug in TSreport - printing of IP addresses was incorrect
  *
@@ -157,6 +160,8 @@ DEVELOPMENT CENTER AT ARGONNE NATIONAL LABORATORY (708-252-2000).
 #include <net/if.h>
 #include <envDefs.h>
 #include <envLib.h>
+
+#include <dbDefs.h>
 #include <epicsPrint.h>
 
 #include <errMdef.h>