Skip to content
Snippets Groups Projects
Commit 9b692d59 authored by Anders Lindh Olsson's avatar Anders Lindh Olsson :8ball:
Browse files

Merge branch 'fix_dbcore_api' into 'master'

Fixed to match base 7.0.6.1 update to epicsShareAPI

See merge request e3/e3-require!79
parents 2e4ba4b7 40782b7e
No related branches found
No related tags found
1 merge request!79Fixed to match base 7.0.6.1 update to epicsShareAPI
Pipeline #104770 passed
......@@ -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*/
......@@ -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>
......
......@@ -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) \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment