win32 port: visibility declration

2013-11-27 08:13:32 +01:00
parent 1dba7a675d
commit 2f31bf74bc
17 changed files with 212 additions and 51 deletions
--- a/pvAccessApp/mb/pvAccessMB.h
+++ b/pvAccessApp/mb/pvAccessMB.h
@@ -1,8 +1,18 @@
 #ifndef _PVACCESSMB_H_
 #define _PVACCESSMB_H_

+#ifdef epicsExportSharedSymbols
+#   define pvAccessMBEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
 #include <pv/mb.h>

+#ifdef pvAccessMBEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef pvAccessMBEpicsExportSharedSymbols
+#endif
+
 MB_DECLARE_EXTERN(channelGet);

 #endif
--- a/pvAccessApp/remote/beaconHandler.h
+++ b/pvAccessApp/remote/beaconHandler.h
@@ -7,13 +7,24 @@
 #ifndef BEACONHANDLER_H
 #define BEACONHANDLER_H

-#include <pv/remote.h>
-#include <pv/pvAccess.h>
+#ifdef epicsExportSharedSymbols
+#   define beaconHandlerEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
+#include <osiSock.h>

 #include <pv/timeStamp.h>
-#include <osiSock.h>
 #include <pv/lock.h>

+#ifdef beaconHandlerEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef beaconHandlerEpicsExportSharedSymbols
+#endif
+
+#include <pv/remote.h>
+#include <pv/pvAccess.h>
+
 namespace epics {
 namespace pvAccess {

--- a/pvAccessApp/remote/blockingTCP.h
+++ b/pvAccessApp/remote/blockingTCP.h
@@ -7,12 +7,19 @@
 #ifndef BLOCKINGTCP_H_
 #define BLOCKINGTCP_H_

-#include <pv/pvaConstants.h>
-#include <pv/remote.h>
-#include <pv/transportRegistry.h>
-#include <pv/introspectionRegistry.h>
-#include <pv/namedLockPattern.h>
-#include <pv/inetAddressUtil.h>
+#include <set>
+#include <map>
+#include <deque>
+
+#ifdef epicsExportSharedSymbols
+#   define blockingTCPEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
+#include <osdSock.h>
+#include <osiSock.h>
+#include <epicsTime.h>
+#include <epicsThread.h>

 #include <pv/byteBuffer.h>
 #include <pv/pvType.h>
@@ -20,14 +27,17 @@
 #include <pv/timer.h>
 #include <pv/event.h>

-#include <osdSock.h>
-#include <osiSock.h>
-#include <epicsTime.h>
-#include <epicsThread.h>
+#ifdef blockingTCPEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef blockingTCPEpicsExportSharedSymbols
+#endif

-#include <set>
-#include <map>
-#include <deque>
+#include <pv/pvaConstants.h>
+#include <pv/remote.h>
+#include <pv/transportRegistry.h>
+#include <pv/introspectionRegistry.h>
+#include <pv/namedLockPattern.h>
+#include <pv/inetAddressUtil.h>

 // not implemented anyway
 #define FLOW_CONTROL 0
--- a/pvAccessApp/remote/blockingUDP.h
+++ b/pvAccessApp/remote/blockingUDP.h
@@ -7,20 +7,29 @@
 #ifndef BLOCKINGUDP_H_
 #define BLOCKINGUDP_H_

-#include <pv/remote.h>
-#include <pv/pvaConstants.h>
-#include <pv/inetAddressUtil.h>
+#ifdef epicsExportSharedSymbols
+#   define blockingUDPEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
+#include <osdSock.h>
+#include <osiSock.h>
+#include <epicsThread.h>

 #include <pv/noDefaultMethods.h>
 #include <pv/byteBuffer.h>
 #include <pv/lock.h>
 #include <pv/event.h>
-
 #include <pv/pvIntrospect.h>

-#include <osdSock.h>
-#include <osiSock.h>
-#include <epicsThread.h>
+#ifdef blockingUDPEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef blockingUDPEpicsExportSharedSymbols
+#endif
+
+#include <pv/remote.h>
+#include <pv/pvaConstants.h>
+#include <pv/inetAddressUtil.h>

 namespace epics {
    namespace pvAccess {
--- a/pvAccessApp/remote/channelSearchManager.h
+++ b/pvAccessApp/remote/channelSearchManager.h
@@ -7,9 +7,20 @@
 #ifndef CHANNELSEARCHMANAGER_H
 #define CHANNELSEARCHMANAGER_H

-#include <pv/remote.h>
+#ifdef epicsExportSharedSymbols
+#   define channelSearchManagerEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
 #include <osiSock.h>

+#include <pv/remote.h>
+
+#ifdef channelSearchManagerEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef channelSearchManagerEpicsExportSharedSymbols
+#endif
+
 namespace epics {
 namespace pvAccess {

--- a/pvAccessApp/remote/remote.h
+++ b/pvAccessApp/remote/remote.h
@@ -7,19 +7,28 @@
 #ifndef REMOTE_H_
 #define REMOTE_H_

-#include <pv/pvaConstants.h>
-#include <pv/configuration.h>
+#ifdef epicsExportSharedSymbols
+#   define remoteEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
+#include <osiSock.h>
+#include <osdSock.h>

 #include <pv/serialize.h>
 #include <pv/pvType.h>
 #include <pv/byteBuffer.h>
 #include <pv/timer.h>
 #include <pv/pvData.h>
-
 #include <pv/sharedPtr.h>

-#include <osiSock.h>
-#include <osdSock.h>
+#ifdef remoteEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef remoteEpicsExportSharedSymbols
+#endif
+
+#include <pv/pvaConstants.h>
+#include <pv/configuration.h>

 /// TODO only here because of the Lockable
 #include <pv/pvAccess.h>
--- a/pvAccessApp/remote/serializationHelper.h
+++ b/pvAccessApp/remote/serializationHelper.h
@@ -8,7 +8,10 @@
 #ifndef SERIALIZATIONHELPER_H_
 #define SERIALIZATIONHELPER_H_

-#include <pv/pvaConstants.h>
+#ifdef epicsExportSharedSymbols
+#   define serializationHelperEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif

 #include <pv/serialize.h>
 #include <pv/pvData.h>
@@ -16,8 +19,13 @@
 #include <pv/pvIntrospect.h>
 #include <pv/byteBuffer.h>

-#include <pv/pvAccess.h>
+#ifdef serializationHelperEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef serializationHelperEpicsExportSharedSymbols
+#endif

+#include <pv/pvaConstants.h>
+#include <pv/pvAccess.h>

 namespace epics {
    namespace pvAccess {
--- a/pvAccessApp/remote/simpleChannelSearchManagerImpl.h
+++ b/pvAccessApp/remote/simpleChannelSearchManagerImpl.h
@@ -7,12 +7,22 @@
 #ifndef SIMPLECHANNELSEARCHMANAGERIMPL_H
 #define SIMPLECHANNELSEARCHMANAGERIMPL_H

-#include <pv/channelSearchManager.h>
+#ifdef epicsExportSharedSymbols
+#   define simpleChannelSearchManagerEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif

 #include <pv/lock.h>
 #include <pv/byteBuffer.h>
 #include <pv/timer.h>

+#ifdef simpleChannelSearchManagerEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef simpleChannelSearchManagerEpicsExportSharedSymbols
+#endif
+
+#include <pv/channelSearchManager.h>
+
 namespace epics {
 namespace pvAccess {

--- a/pvAccessApp/remote/transportRegistry.h
+++ b/pvAccessApp/remote/transportRegistry.h
@@ -11,6 +11,11 @@
 #include <vector>
 #include <iostream>

+#ifdef epicsExportSharedSymbols
+#   define transportRegistryEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
 #include <osiSock.h>

 #include <pv/lock.h>
@@ -20,6 +25,11 @@
 #include <pv/inetAddressUtil.h>
 #include <pv/sharedPtr.h>

+#ifdef transportRegistryEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef transportRegistryEpicsExportSharedSymbols
+#endif
+
 namespace epics {
 namespace pvAccess {

--- a/pvAccessApp/remoteClient/clientContextImpl.cpp
+++ b/pvAccessApp/remoteClient/clientContextImpl.cpp
@@ -4,17 +4,22 @@
 * in file LICENSE that is included with this distribution.
 */

-#include <pv/pvAccess.h>
 #include <iostream>
 #include <sstream>
-#include <pv/lock.h>
-#include <pv/standardPVField.h>
 #include <memory>
 #include <queue>
-
 #include <stdexcept>
-#include <pv/pvaConstants.h>
+
+#include <pv/lock.h>
 #include <pv/timer.h>
+#include <pv/bitSetUtil.h>
+#include <pv/serializationHelper.h>
+#include <pv/convert.h>
+#include <pv/queue.h>
+#include <pv/standardPVField.h>
+
+#include <pv/pvAccess.h>
+#include <pv/pvaConstants.h>
 #include <pv/blockingUDP.h>
 #include <pv/blockingTCP.h>
 #include <pv/namedLockPattern.h>
@@ -27,10 +32,6 @@
 #include <pv/configuration.h>
 #include <pv/beaconHandler.h>
 #include <pv/logger.h>
-#include <pv/bitSetUtil.h>
-#include <pv/serializationHelper.h>
-#include <pv/convert.h>
-#include <pv/queue.h>

 #include <pv/pvAccessMB.h>

--- a/pvAccessApp/remoteClient/clientContextImpl.h
+++ b/pvAccessApp/remoteClient/clientContextImpl.h
@@ -7,9 +7,20 @@
 #ifndef CLIENTCONTEXTIMPL_H_
 #define CLIENTCONTEXTIMPL_H_

+#ifdef epicsExportSharedSymbols
+#   define clientContextImplEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
+#include <pv/sharedPtr.h>
+
+#ifdef clientContextImplEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef clientContextImplEpicsExportSharedSymbols
+#endif
+
 #include <pv/pvAccess.h>
 #include <pv/remote.h>
-#include <pv/sharedPtr.h>
 #include <pv/channelSearchManager.h>
 #include <pv/inetAddressUtil.h>

--- a/pvAccessApp/server/baseChannelRequester.h
+++ b/pvAccessApp/server/baseChannelRequester.h
@@ -7,12 +7,22 @@
 #ifndef BASECHANNELREQUESTER_H_
 #define BASECHANNELREQUESTER_H_

-#include <pv/serverContext.h>
-#include <pv/serverChannelImpl.h>
+#ifdef epicsExportSharedSymbols
+#   define baseChannelRequesterEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif

 #include <pv/requester.h>
 #include <pv/destroyable.h>

+#ifdef baseChannelRequesterEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef baseChannelRequesterEpicsExportSharedSymbols
+#endif
+
+#include <pv/serverContext.h>
+#include <pv/serverChannelImpl.h>
+
 namespace epics {
 namespace pvAccess {

--- a/pvAccessApp/server/beaconEmitter.h
+++ b/pvAccessApp/server/beaconEmitter.h
@@ -7,15 +7,25 @@
 #ifndef BEACONEMITTER_H
 #define BEACONEMITTER_H

-#include <pv/timer.h>
-#include <pv/timeStamp.h>
-#include <pv/remote.h>
+#ifdef epicsExportSharedSymbols
+#   define beaconEmitterEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif

 #include <osiSock.h>

+#include <pv/timer.h>
+#include <pv/timeStamp.h>
+#include <pv/sharedPtr.h>
+
+#ifdef beaconEmitterEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef beaconEmitterEpicsExportSharedSymbols
+#endif
+
+#include <pv/remote.h>
 #include <pv/beaconServerStatusProvider.h>
 //#include <pv/serverContext.h>
-#include <pv/sharedPtr.h>

 namespace epics { namespace pvAccess {

--- a/pvAccessApp/server/serverChannelImpl.h
+++ b/pvAccessApp/server/serverChannelImpl.h
@@ -7,10 +7,21 @@
 #ifndef SERVERCHANNEL_H_
 #define SERVERCHANNEL_H_

+#ifdef epicsExportSharedSymbols
+#   define serverChannelImplEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
+#include <pv/destroyable.h>
+
+#ifdef serverChannelImplEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef serverChannelImplEpicsExportSharedSymbols
+#endif
+
 #include <pv/remote.h>
 #include <pv/clientContextImpl.h>

-#include <pv/destroyable.h>

 namespace epics {
 namespace pvAccess {
--- a/pvAccessApp/utils/introspectionRegistry.h
+++ b/pvAccessApp/utils/introspectionRegistry.h
@@ -7,6 +7,14 @@
 #ifndef INTROSPECTIONREGISTRY_H
 #define INTROSPECTIONREGISTRY_H

+#include <map>
+#include <iostream>
+
+#ifdef epicsExportSharedSymbols
+#   define introspectionRegistryEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
 #include <pv/lock.h>
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
@@ -16,8 +24,10 @@
 #include <pv/status.h>
 #include <pv/standardField.h>

-#include <map>
-#include <iostream>
+#ifdef introspectionRegistryEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef introspectionRegistryEpicsExportSharedSymbols
+#endif

 // TODO check for memory leaks

--- a/pvAccessApp/utils/namedLockPattern.h
+++ b/pvAccessApp/utils/namedLockPattern.h
@@ -10,10 +10,20 @@
 #include <map>
 #include <iostream>

+#ifdef epicsExportSharedSymbols
+#   define namedLockPatternEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
 #include <pv/lock.h>
 #include <pv/pvType.h>
 #include <pv/sharedPtr.h>

+#ifdef namedLockPatternEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef namedLockPatternEpicsExportSharedSymbols
+#endif
+
 #include <pv/referenceCountingLock.h>

 // TODO implement using smart pointers
--- a/pvAccessApp/utils/referenceCountingLock.h
+++ b/pvAccessApp/utils/referenceCountingLock.h
@@ -7,10 +7,20 @@
 #ifndef REFERENCECOUNTINGLOCK_H
 #define REFERENCECOUNTINGLOCK_H

+#ifdef epicsExportSharedSymbols
+#   define referenceCountingLockEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
 #include <pv/lock.h>
 #include <pv/pvType.h>
 #include <pv/sharedPtr.h>

+#ifdef referenceCountingLockEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef referenceCountingLockEpicsExportSharedSymbols
+#endif
+
 namespace epics {
 namespace pvAccess {