From 0f67cc3054ffa65edb5e04ae1b42a564d9dea6e8 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Thu, 4 May 2000 01:21:44 +0000
Subject: [PATCH] fixed some of the DLL export problems

---
 src/iocsh/Makefile           | 2 +-
 src/iocsh/asTestRegister.c   | 2 +-
 src/iocsh/caTestRegister.c   | 2 +-
 src/iocsh/dbAccessRegister.c | 3 ++-
 src/iocsh/dbBkptRegister.c   | 2 +-
 src/iocsh/dbCaTestRegister.c | 2 +-
 src/iocsh/dbStaticRegister.c | 2 +-
 src/iocsh/iocUtil.c          | 4 ++--
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/iocsh/Makefile b/src/iocsh/Makefile
index 848f4f852..28563a9c6 100644
--- a/src/iocsh/Makefile
+++ b/src/iocsh/Makefile
@@ -38,7 +38,7 @@ LIBRARY_IOC = iocsh
 
 iocsh_OBJS += $(EPICS_BASE_BIN)/registerRecordDeviceDriver.o
 
-iocsh_DLL_LIBS  = miscIoc rsrvIoc dbtoolsIoc asIoc dbIoc registryIoc dbStaticIoc Com
+iocsh_DLL_LIBS  = Com dbStaticIoc dbIoc asIoc rsrvIoc dbtoolsIoc registryIoc miscIoc 
 registryIoc_DIR=$(EPICS_BASE_LIB)
 dbtoolsIoc_DIR=$(EPICS_BASE_LIB)
 miscIoc_DIR=$(EPICS_BASE_LIB)
diff --git a/src/iocsh/asTestRegister.c b/src/iocsh/asTestRegister.c
index 438a086c0..f1253156c 100644
--- a/src/iocsh/asTestRegister.c
+++ b/src/iocsh/asTestRegister.c
@@ -12,9 +12,9 @@ of this distribution.
 #include <stdio.h>
 #include <ctype.h>
 
-#include "ioccrf.h"
 #include "asDbLib.h"
 #define epicsExportSharedSymbols
+#include "ioccrf.h"
 #include "asTestRegister.h"
 
 /* asSetFilename */
diff --git a/src/iocsh/caTestRegister.c b/src/iocsh/caTestRegister.c
index c345ac3c2..099ee0a75 100644
--- a/src/iocsh/caTestRegister.c
+++ b/src/iocsh/caTestRegister.c
@@ -12,10 +12,10 @@ of this distribution.
 #include <stdio.h>
 #include <ctype.h>
 
-#include "ioccrf.h"
 #include "rsrv.h"
 #include "dbEvent.h"
 #define epicsExportSharedSymbols
+#include "ioccrf.h"
 #include "caTestRegister.h"
 
 /* casr */
diff --git a/src/iocsh/dbAccessRegister.c b/src/iocsh/dbAccessRegister.c
index 876570bc3..bd6cb8a40 100644
--- a/src/iocsh/dbAccessRegister.c
+++ b/src/iocsh/dbAccessRegister.c
@@ -12,6 +12,7 @@ of this distribution.
 #include <stdio.h>
 #include <ctype.h>
 
+#include "iocInit.h"
 #include "dbAccess.h"
 #include "dbLoadTemplate.h"
 #include "registryRecordType.h"
@@ -68,7 +69,7 @@ static ioccrfFuncDef registerRecordDeviceDriverFuncDef =
     {"registerRecordDeviceDriver",1,registerRecordDeviceDriverArgs};
 static void registerRecordDeviceDriverCallFunc(ioccrfArg **args)
 {
-    registerRecordDeviceDriver(pdbbase);
+    registerRecordDeviceDriverBase(pdbbase);
 }
 
 /* iocInit */
diff --git a/src/iocsh/dbBkptRegister.c b/src/iocsh/dbBkptRegister.c
index 778c1997e..ea1f16fa1 100644
--- a/src/iocsh/dbBkptRegister.c
+++ b/src/iocsh/dbBkptRegister.c
@@ -12,7 +12,6 @@ of this distribution.
 #include <stdio.h>
 #include <ctype.h>
 
-#include "ioccrf.h"
 #include "ellLib.h"
 #include "osiThread.h"
 #include "osiSem.h"
@@ -25,6 +24,7 @@ of this distribution.
 #include "dbCommon.h"
 #include "dbBkpt.h"
 #define epicsExportSharedSymbols
+#include "ioccrf.h"
 #include "dbBkptRegister.h"
 
 /* dbb */
diff --git a/src/iocsh/dbCaTestRegister.c b/src/iocsh/dbCaTestRegister.c
index 31cffdedb..0fef9e006 100644
--- a/src/iocsh/dbCaTestRegister.c
+++ b/src/iocsh/dbCaTestRegister.c
@@ -12,9 +12,9 @@ of this distribution.
 #include <stdio.h>
 #include <ctype.h>
 
-#include "ioccrf.h"
 #include "dbCaTest.h"
 #define epicsExportSharedSymbols
+#include "ioccrf.h"
 #include "dbCaTestRegister.h"
 
 /* dbcar */
diff --git a/src/iocsh/dbStaticRegister.c b/src/iocsh/dbStaticRegister.c
index ced31598c..446f7263f 100644
--- a/src/iocsh/dbStaticRegister.c
+++ b/src/iocsh/dbStaticRegister.c
@@ -12,11 +12,11 @@ of this distribution.
 #include <stdio.h>
 #include <ctype.h>
 
-#include "ioccrf.h"
 #include "dbAccess.h"
 #include "dbStaticLib.h"
 #include "registryRecordType.h"
 #define epicsExportSharedSymbols
+#include "ioccrf.h"
 #include "dbStaticRegister.h"
 
 /* dbDumpRecDes */
diff --git a/src/iocsh/iocUtil.c b/src/iocsh/iocUtil.c
index b4ef47d6e..d9e922ef7 100644
--- a/src/iocsh/iocUtil.c
+++ b/src/iocsh/iocUtil.c
@@ -7,10 +7,10 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include <osiThread.h>
+#include "osiThread.h"
 
-#include "ioccrf.h"
 #define epicsExportSharedSymbols
+#include "ioccrf.h"
 
 
 /* < (runScript) command */