diff --git a/src/iocsh/Makefile b/src/iocsh/Makefile index 3ffc1932b..b98967d66 100644 --- a/src/iocsh/Makefile +++ b/src/iocsh/Makefile @@ -41,7 +41,7 @@ LIBRARY_IOC = iocsh OBJS += registerRecordDeviceDriverRegister -iocsh_DLL_LIBS = Com registryIoc dbStaticIoc dbIoc asIoc rsrvIoc dbtoolsIoc miscIoc +iocsh_DLL_LIBS = miscIoc rsrvIoc dbtoolsIoc asIoc dbIoc registryIoc dbStaticIoc Com registryIoc_DIR=$(EPICS_BASE_LIB) dbtoolsIoc_DIR=$(EPICS_BASE_LIB) miscIoc_DIR=$(EPICS_BASE_LIB) diff --git a/src/iocsh/dbAccessRegister.c b/src/iocsh/dbAccessRegister.c index d588d2b03..18dd2a772 100644 --- a/src/iocsh/dbAccessRegister.c +++ b/src/iocsh/dbAccessRegister.c @@ -18,6 +18,7 @@ of this distribution. #define epicsExportSharedSymbols #include "registryRecordType.h" #include "dbAccessRegister.h" +#include "ioccrf.h" #ifdef __rtems__ # define dbLoadDatabase dbLoadDatabaseRTEMS diff --git a/src/iocsh/registerRecordDeviceDriverRegister.c b/src/iocsh/registerRecordDeviceDriverRegister.c index 8a2c68859..f6d715dc9 100644 --- a/src/iocsh/registerRecordDeviceDriverRegister.c +++ b/src/iocsh/registerRecordDeviceDriverRegister.c @@ -14,7 +14,6 @@ of this distribution. #include "dbAccess.h" #include "ioccrf.h" -#define epicsExportSharedSymbols #include "registerRecordDeviceDriverRegister.h" /* registerRecordDeviceDriver */ @@ -29,7 +28,7 @@ static void registerRecordDeviceDriverCallFunc(ioccrfArg **args) registerRecordDeviceDriver(pdbbase); } -void epicsShareAPI registerRecordDeviceDriverRegister(void) +void registerRecordDeviceDriverRegister(void) { ioccrfRegister( ®isterRecordDeviceDriverFuncDef,registerRecordDeviceDriverCallFunc); diff --git a/src/iocsh/registerRecordDeviceDriverRegister.h b/src/iocsh/registerRecordDeviceDriverRegister.h index 45d709cb9..db848e533 100644 --- a/src/iocsh/registerRecordDeviceDriverRegister.h +++ b/src/iocsh/registerRecordDeviceDriverRegister.h @@ -16,7 +16,7 @@ of this distribution. extern "C" { #endif -epicsShareFunc void epicsShareAPI registerRecordDeviceDriverRegister(void); +void registerRecordDeviceDriverRegister(void); #ifdef __cplusplus }