fixups for DBCORE_API

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;

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"

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"

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

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 (

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

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 & );

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);

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 */

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
 

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;

modules/database/test/std/rec/asTest.c

@@ -37,6 +37,8 @@
 
 #include "testMain.h"
 
+#include "shareLib.h"
+
 epicsShareFunc void testRestore(void);
 
 #include "epicsExport.h"