From 63f098a6d85e2d93f06adcd76e569054cb5d6fe2 Mon Sep 17 00:00:00 2001
From: Dirk Zimoch <dirk.zimoch@psi.ch>
Date: Thu, 20 Apr 2017 14:26:21 +0200
Subject: [PATCH] cleanup of includes
---
require.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/require.c b/require.c
index da754691..e19001a2 100644
--- a/require.c
+++ b/require.c
@@ -26,8 +26,6 @@
#include <errno.h>
#include <recSup.h>
#include <initHooks.h>
-#include <dbAccess.h>
-#include <dbAccess.h>
#include <osiFileName.h>
#include <epicsVersion.h>
@@ -36,10 +34,9 @@
#define epicsGetStdout() stdout
extern int dbLoadDatabase(const char *filename, const char *path, const char *substitutions);
-extern int dbLoadTemplate(const char *filename);
int dbLoadRecords(const char *filename, const char *substitutions)
{
- /* This implementation respects EPICS_DB_INCLUDE_PATH */
+ /* This implementation uses EPICS_DB_INCLUDE_PATH */
return dbLoadDatabase(filename, NULL, substitutions);
}
extern volatile int interruptAccept;
@@ -48,10 +45,10 @@ extern volatile int interruptAccept;
#include <iocsh.h>
#include <dbAccess.h>
+/* This prototype is missing in older EPICS versions */
epicsShareFunc int epicsShareAPI iocshCmd(const char *cmd);
#include <epicsExit.h>
#include <epicsStdio.h>
-#include <dbLoadTemplate.h>
#include <osiFileName.h>
#include <epicsExport.h>
@@ -68,12 +65,8 @@ int requireDebug;
#include <symLib.h>
#include <sysSymTbl.h>
- #include <sysLib.h>
- #include <symLib.h>
#include <loadLib.h>
#include <shellLib.h>
- #include <usrLib.h>
- #include <taskLib.h>
#include <ioLib.h>
#include <envLib.h>
#include <epicsAssert.h>
--
GitLab