From 40782b7ec39bf8b6af4a13e1f161ea65d3de362b Mon Sep 17 00:00:00 2001 From: Simon Rose <simon.rose@ess.eu> Date: Wed, 9 Feb 2022 15:58:15 +0100 Subject: [PATCH] Fixed to match base 7.0.6.1 update to epicsShareAPI --- require-ess/src/dbLoadTemplate.h | 6 +++--- require-ess/src/require.c | 2 +- require-ess/src/runScript.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/require-ess/src/dbLoadTemplate.h b/require-ess/src/dbLoadTemplate.h index 1894a929..0d37f6ce 100644 --- a/require-ess/src/dbLoadTemplate.h +++ b/require-ess/src/dbLoadTemplate.h @@ -11,8 +11,8 @@ #ifndef INCdbLoadTemplateh #define INCdbLoadTemplateh -#include "shareLib.h" -epicsShareFunc int dbLoadTemplate(const char *sub_file, const char *cmd_collect, - const char *path); +#include "dbCoreAPI.h" +DBCORE_API int dbLoadTemplate(const char *sub_file, const char *cmd_collect, + const char *path); #endif /*INCdbLoadTemplateh*/ diff --git a/require-ess/src/require.c b/require-ess/src/require.c index 1943a648..42a31d8a 100644 --- a/require-ess/src/require.c +++ b/require-ess/src/require.c @@ -32,7 +32,7 @@ #include <dbAccess.h> #include <iocsh.h> /* This prototype is missing in older EPICS versions */ -epicsShareFunc int epicsShareAPI iocshCmd(const char *cmd); +DBCORE_API int epicsStdCall iocshCmd(const char *cmd); #include <epicsExit.h> #include <epicsExport.h> #include <epicsStdio.h> diff --git a/require-ess/src/runScript.c b/require-ess/src/runScript.c index 789e28d2..191e71d1 100644 --- a/require-ess/src/runScript.c +++ b/require-ess/src/runScript.c @@ -21,7 +21,7 @@ #include <iocsh.h> #include <osiFileName.h> -epicsShareFunc int epicsShareAPI iocshCmd(const char *cmd); +DBCORE_API int epicsStdCall iocshCmd(const char *cmd); #include <epicsExport.h> #define IS_ABS_PATH(filename) \ -- GitLab