drop epicsExportSharedSymbols un/re-define

mdavidsaver · Nov 16, 2019 · c9a39f7 · c9a39f7
1 parent a62c433
commit c9a39f7
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 162 deletions.
diff --git a/modules/ca/src/client/bhe.h b/modules/ca/src/client/bhe.h
@@ -22,20 +22,12 @@
 #ifndef bheh
 #define bheh
 
-#ifdef epicsExportSharedSymbols
-#   define bhehEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "tsDLList.h"
 #include "tsFreeList.h"
 #include "epicsTime.h"
 #include "compilerDependencies.h"
 
-#ifdef bhehEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #include "inetAddrID.h"
 #include "caProto.h"

diff --git a/modules/ca/src/client/cac.h b/modules/ca/src/client/cac.h
@@ -22,11 +22,6 @@
 #ifndef cach
 #define cach
 
-#ifdef epicsExportSharedSymbols
-#   define cach_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "compilerDependencies.h"
 #include "ipAddrToAsciiAsynchronous.h"
 #include "msgForMultiplyDefinedPV.h"
@@ -35,10 +30,7 @@
 #include "freeList.h"
 #include "localHostName.h"
 
-#ifdef cach_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #include "nciu.h"
 #include "comBuf.h"

diff --git a/modules/ca/src/client/cacIO.h b/modules/ca/src/client/cacIO.h
@@ -47,20 +47,12 @@
 #include <new>
 #include <stdarg.h>
 
-#ifdef epicsExportSharedSymbols
-#   define cacIOh_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "tsDLList.h"
 #include "epicsMutex.h"
 #include "epicsGuard.h"
 #include "epicsThread.h"
 
-#ifdef cacIOh_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 
 class cacChannel;

diff --git a/modules/ca/src/client/cadef.h b/modules/ca/src/client/cadef.h
@@ -32,17 +32,9 @@
 #   include <stdarg.h>
 #endif
 
-#ifdef epicsExportSharedSymbols
-#   define INCLcadefh_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsThread.h"
 
-#ifdef INCLcadefh_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 
 #include "caerr.h"

diff --git a/modules/ca/src/client/caerr.h b/modules/ca/src/client/caerr.h
@@ -23,17 +23,9 @@
 #ifndef INCLcaerrh
 #define INCLcaerrh
 
-#ifdef epicsExportSharedSymbols
-#   define INCLcaerrh_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#   include "epicsTypes.h"
+#include "epicsTypes.h"
 
-#ifdef INCLcaerrh_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 /*  CA Status Code Definitions   */
 

diff --git a/modules/ca/src/client/db_access.h b/modules/ca/src/client/db_access.h
@@ -17,18 +17,10 @@
 
 #include <stddef.h>
 
-#ifdef epicsExportSharedSymbols
-#   define INCLdb_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsTypes.h"
 #include "epicsTime.h"
 
-#ifdef INCLdb_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 
 #ifdef __cplusplus

diff --git a/modules/ca/src/client/disconnectGovernorTimer.h b/modules/ca/src/client/disconnectGovernorTimer.h
@@ -26,19 +26,11 @@
 #ifndef disconnectGovernorTimerh  
 #define disconnectGovernorTimerh
 
-#ifdef epicsExportSharedSymbols
-#   define searchTimerh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsMutex.h"
 #include "epicsGuard.h"
 #include "epicsTimer.h"
 
-#ifdef searchTimerh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #include "caProto.h"
 #include "netiiu.h"

diff --git a/modules/ca/src/client/nciu.h b/modules/ca/src/client/nciu.h
@@ -25,21 +25,13 @@
 #ifndef nciuh
 #define nciuh
 
-#ifdef epicsExportSharedSymbols
-#   define nciuh_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "resourceLib.h"
 #include "tsDLList.h"
 #include "tsFreeList.h"
 #include "epicsMutex.h"
 #include "compilerDependencies.h"
 
-#ifdef nciuh_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #define CA_MINOR_PROTOCOL_REVISION 13
 #include "caProto.h"

diff --git a/modules/ca/src/client/oldAccess.h b/modules/ca/src/client/oldAccess.h
@@ -28,19 +28,11 @@
 
 #include <memory>
 
-#ifdef epicsExportSharedSymbols
-#   define oldAccessh_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "tsFreeList.h"
 #include "compilerDependencies.h"
 #include "osiSock.h"
 
-#ifdef oldAccessh_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #include "caProto.h"
 #include "cacIO.h"

diff --git a/modules/ca/src/client/repeaterClient.h b/modules/ca/src/client/repeaterClient.h
@@ -26,19 +26,11 @@
 #ifndef repeaterClienth
 #define repeaterClienth
 
-#ifdef epicsExportSharedSymbols
-#   define repeaterClienth_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "tsDLList.h"
 #include "tsFreeList.h"
 #include "compilerDependencies.h"
 
-#ifdef repeaterClienth_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 union osiSockAddr;
 

diff --git a/modules/ca/src/client/repeaterSubscribeTimer.h b/modules/ca/src/client/repeaterSubscribeTimer.h
@@ -28,17 +28,7 @@
 
 #include "epicsTimer.h"
 
-#ifdef epicsExportSharedSymbols
-#   define repeaterSubscribeTimerh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#include "epicsTimer.h"
-
-#ifdef repeaterSubscribeTimerh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 class epicsMutex;
 class cacContextNotify;

diff --git a/modules/ca/src/client/searchTimer.h b/modules/ca/src/client/searchTimer.h
@@ -26,19 +26,11 @@
 #ifndef searchTimerh  
 #define searchTimerh
 
-#ifdef epicsExportSharedSymbols
-#   define searchTimerh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsMutex.h"
 #include "epicsGuard.h"
 #include "epicsTimer.h"
 
-#ifdef searchTimerh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #include "caProto.h"
 #include "netiiu.h"

diff --git a/modules/ca/src/client/syncGroup.h b/modules/ca/src/client/syncGroup.h
@@ -25,21 +25,13 @@
 #ifndef syncGrouph
 #define syncGrouph
 
-#ifdef epicsExportSharedSymbols
-#   define syncGrouph_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "tsDLList.h"
 #include "tsFreeList.h"
 #include "resourceLib.h"
 #include "epicsEvent.h"
 #include "compilerDependencies.h"
 
-#ifdef syncGrouph_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #include "cadef.h"
 #include "cacIO.h"

diff --git a/modules/ca/src/client/tcpRecvWatchdog.h b/modules/ca/src/client/tcpRecvWatchdog.h
@@ -26,17 +26,9 @@
 #ifndef tcpRecvWatchdogh  
 #define tcpRecvWatchdogh
 
-#ifdef epicsExportSharedSymbols
-#   define tcpRecvWatchdogh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsTimer.h"
 
-#ifdef tcpRecvWatchdogh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 class tcpiiu;
 

diff --git a/modules/ca/src/client/tcpSendWatchdog.h b/modules/ca/src/client/tcpSendWatchdog.h
@@ -27,17 +27,9 @@
 #define tcpSendWatchdogh
 
 
-#ifdef epicsExportSharedSymbols
-#   define tcpSendWatchdogh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsTimer.h"
 
-#ifdef tcpSendWatchdogh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 class tcpSendWatchdog : private epicsTimerNotify {
 public:

diff --git a/modules/ca/src/client/udpiiu.h b/modules/ca/src/client/udpiiu.h
@@ -27,20 +27,12 @@
 
 #include <memory>
 
-#ifdef epicsExportSharedSymbols
-#   define udpiiuh_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "osiSock.h"
 #include "epicsThread.h"
 #include "epicsTime.h"
 #include "tsDLList.h"
 
-#ifdef udpiiuh_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #include "netiiu.h"
 #include "searchTimer.h"

diff --git a/modules/database/src/ioc/db/dbAccessDefs.h b/modules/database/src/ioc/db/dbAccessDefs.h
@@ -11,18 +11,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 "shareLib.h"
-#endif
+#include "shareLib.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
@@ -19,25 +19,26 @@
 #ifndef dbCACh
 #define dbCACh
 
-#ifdef epicsExportSharedSymbols
-#   define dbCACh_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "stdlib.h"
 
 #include <memory> // std::auto_ptr
 
 #include "tsDLList.h"
 #include "tsFreeList.h"
 #include "resourceLib.h"
+
+#ifdef epicsExportSharedSymbols
+#   define dbCACh_restore_epicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
 #include "cacIO.h"
 #include "compilerDependencies.h"
 
 #ifdef dbCACh_restore_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols
-#   include "shareLib.h"
 #endif
+#include "shareLib.h"
 
 #include "db_access.h"
 #include "dbNotify.h"