From 417821ddc0218455d4d58fcb5f063be651e579ba Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Thu, 1 Apr 2021 11:09:53 -0700
Subject: [PATCH] fixups for DBCORE_API

---
 modules/database/src/ioc/db/dbAccess.c                 |  1 +
 modules/database/src/ioc/db/dbAccessDefs.h             | 10 +---------
 modules/database/src/ioc/db/dbCAC.h                    | 10 +---------
 modules/database/src/ioc/db/dbCaTest.c                 |  1 -
 modules/database/src/ioc/db/dbChannelIO.h              |  9 ---------
 modules/database/src/ioc/db/dbEvent.h                  |  9 ---------
 modules/database/src/ioc/db/dbPutNotifyBlocker.h       |  8 --------
 modules/database/src/ioc/dbStatic/dbStaticRun.c        |  1 +
 modules/database/src/ioc/rsrv/server.h                 |  8 --------
 .../database/src/tools/registerRecordDeviceDriver.pl   |  1 +
 modules/database/test/ioc/db/dbCaLinkTest.c            |  1 +
 modules/database/test/std/rec/asTest.c                 |  2 ++
 12 files changed, 8 insertions(+), 53 deletions(-)

diff --git a/modules/database/src/ioc/db/dbAccess.c b/modules/database/src/ioc/db/dbAccess.c
index 6f2ae73f1..d4d8e873a 100644
--- a/modules/database/src/ioc/db/dbAccess.c
+++ b/modules/database/src/ioc/db/dbAccess.c
@@ -61,6 +61,7 @@
 #include "recGbl.h"
 #include "recSup.h"
 #include "special.h"
+#include "epicsExport.h"
 
 struct dbBase *pdbbase = 0;
 volatile int interruptAccept=FALSE;
diff --git a/modules/database/src/ioc/db/dbAccessDefs.h b/modules/database/src/ioc/db/dbAccessDefs.h
index 09e5a2f19..bcd8d15df 100644
--- a/modules/database/src/ioc/db/dbAccessDefs.h
+++ b/modules/database/src/ioc/db/dbAccessDefs.h
@@ -12,18 +12,10 @@
 #ifndef INCdbAccessDefsh
 #define INCdbAccessDefsh
 
-#ifdef epicsExportSharedSymbols
-#   define INCLdb_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsTypes.h"
 #include "epicsTime.h"
 
-#ifdef INCLdb_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "dbCoreAPI.h"
-#endif
+#include "dbCoreAPI.h"
 
 #include "dbBase.h"
 #include "dbAddr.h"
diff --git a/modules/database/src/ioc/db/dbCAC.h b/modules/database/src/ioc/db/dbCAC.h
index 737dac5fb..9fbba07cd 100644
--- a/modules/database/src/ioc/db/dbCAC.h
+++ b/modules/database/src/ioc/db/dbCAC.h
@@ -19,11 +19,6 @@
 #ifndef dbCACh
 #define dbCACh
 
-#ifdef epicsExportSharedSymbols
-#   define dbCACh_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "stdlib.h"
 
 #include <memory> // std::auto_ptr
@@ -34,10 +29,7 @@
 #include "cacIO.h"
 #include "compilerDependencies.h"
 
-#ifdef dbCACh_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "dbCoreAPI.h"
-#endif
+#include "dbCoreAPI.h"
 
 #include "db_access.h"
 #include "dbNotify.h"
diff --git a/modules/database/src/ioc/db/dbCaTest.c b/modules/database/src/ioc/db/dbCaTest.c
index c45d535a0..1610a8d59 100644
--- a/modules/database/src/ioc/db/dbCaTest.c
+++ b/modules/database/src/ioc/db/dbCaTest.c
@@ -27,7 +27,6 @@
 #include "epicsStdio.h"
 
 #include "dbStaticLib.h"
-#undef epicsExportSharedSymbols
 /*definitions needed because of old vs new database access*/
 #undef DBR_SHORT
 #undef DBR_PUT_ACKT
diff --git a/modules/database/src/ioc/db/dbChannelIO.h b/modules/database/src/ioc/db/dbChannelIO.h
index 661fbb4e4..6921b12eb 100644
--- a/modules/database/src/ioc/db/dbChannelIO.h
+++ b/modules/database/src/ioc/db/dbChannelIO.h
@@ -20,17 +20,8 @@
 #ifndef dbChannelIOh
 #define dbChannelIOh
 
-#ifdef epicsExportSharedSymbols
-#   define dbChannelIOh_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "compilerDependencies.h"
 
-#ifdef dbChannelIOh_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#endif
-
 class dbChannelIO : public cacChannel, public dbContextPrivateListOfIO {
 public:
     dbChannelIO (
diff --git a/modules/database/src/ioc/db/dbEvent.h b/modules/database/src/ioc/db/dbEvent.h
index 4ddd9da27..277d6c07e 100644
--- a/modules/database/src/ioc/db/dbEvent.h
+++ b/modules/database/src/ioc/db/dbEvent.h
@@ -20,17 +20,8 @@
 #ifndef INCLdbEventh
 #define INCLdbEventh
 
-#ifdef epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#   define INCLdbEventhExporting
-#endif
-
 #include "epicsThread.h"
 
-#ifdef INCLdbEventhExporting
-#   define epicsExportSharedSymbols
-#endif
-
 #include "dbCoreAPI.h"
 
 #ifdef __cplusplus
diff --git a/modules/database/src/ioc/db/dbPutNotifyBlocker.h b/modules/database/src/ioc/db/dbPutNotifyBlocker.h
index 17974e075..c96858717 100644
--- a/modules/database/src/ioc/db/dbPutNotifyBlocker.h
+++ b/modules/database/src/ioc/db/dbPutNotifyBlocker.h
@@ -17,17 +17,9 @@
 #ifndef dbPutNotifyBlockerh
 #define dbPutNotifyBlockerh
 
-#ifdef epicsExportSharedSymbols
-#define dbPutNotifyBlockerh_restore_epicsExportSharedSymbols
-#undef epicsExportSharedSymbols
-#endif
-
 #include "tsFreeList.h"
 #include "compilerDependencies.h"
 
-#ifdef dbPutNotifyBlockerh_restore_epicsExportSharedSymbols
-#endif
-
 class dbPutNotifyBlocker : public dbBaseIO {
 public:
     dbPutNotifyBlocker ( epicsMutex & );
diff --git a/modules/database/src/ioc/dbStatic/dbStaticRun.c b/modules/database/src/ioc/dbStatic/dbStaticRun.c
index 58e50ab29..198ff5c1a 100644
--- a/modules/database/src/ioc/dbStatic/dbStaticRun.c
+++ b/modules/database/src/ioc/dbStatic/dbStaticRun.c
@@ -30,6 +30,7 @@
 #include "dbAccess.h"
 #include "devSup.h"
 #include "special.h"
+#include "epicsExport.h"
 
 int dbConvertStrict = 0;
 epicsExportAddress(int, dbConvertStrict);
diff --git a/modules/database/src/ioc/rsrv/server.h b/modules/database/src/ioc/rsrv/server.h
index 5b03f65a4..c0593739e 100644
--- a/modules/database/src/ioc/rsrv/server.h
+++ b/modules/database/src/ioc/rsrv/server.h
@@ -16,11 +16,6 @@
 #ifndef INCLserverh
 #define INCLserverh
 
-#ifdef epicsExportSharedSymbols
-#   define rsrvRestore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif /* ifdef epicsExportSharedSymbols */
-
 #include "epicsThread.h"
 #include "epicsMutex.h"
 #include "epicsEvent.h"
@@ -35,9 +30,6 @@
 #include "epicsAssert.h"
 #include "osiSock.h"
 
-#ifdef rsrvRestore_epicsExportSharedSymbols
-#endif
-
 /* a modified ca header with capacity for large arrays */
 typedef struct caHdrLargeArray {
     ca_uint32_t m_postsize;     /* size of message extension */
diff --git a/modules/database/src/tools/registerRecordDeviceDriver.pl b/modules/database/src/tools/registerRecordDeviceDriver.pl
index 49354fbd7..f95230dee 100644
--- a/modules/database/src/tools/registerRecordDeviceDriver.pl
+++ b/modules/database/src/tools/registerRecordDeviceDriver.pl
@@ -77,6 +77,7 @@ print $out (<< "END");
 #include "iocshRegisterCommon.h"
 #include "registryCommon.h"
 #include "recSup.h"
+#include "shareLib.h"
 
 END
 
diff --git a/modules/database/test/ioc/db/dbCaLinkTest.c b/modules/database/test/ioc/db/dbCaLinkTest.c
index 7916dd1eb..b433db9c6 100644
--- a/modules/database/test/ioc/db/dbCaLinkTest.c
+++ b/modules/database/test/ioc/db/dbCaLinkTest.c
@@ -27,6 +27,7 @@
 #include "dbAccess.h"
 #include "epicsStdio.h"
 #include "dbEvent.h"
+#include "shareLib.h"
 
 /* Declarations from cadef.h and db_access.h which we can't include here */
 typedef void * chid;
diff --git a/modules/database/test/std/rec/asTest.c b/modules/database/test/std/rec/asTest.c
index 3a956efcb..448a762fd 100644
--- a/modules/database/test/std/rec/asTest.c
+++ b/modules/database/test/std/rec/asTest.c
@@ -37,6 +37,8 @@
 
 #include "testMain.h"
 
+#include "shareLib.h"
+
 epicsShareFunc void testRestore(void);
 
 #include "epicsExport.h"