From 12d68fe20958a45e15462d24e2ed907ab607f52f Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 5 Apr 2016 18:40:48 -0500
Subject: [PATCH] Add epicsExportSharedSymbols, move some includes

---
 src/ca/caChannel.cpp                          |  3 ++-
 src/remote/abstractResponseHandler.cpp        | 11 +++++-----
 src/remote/beaconHandler.cpp                  |  1 +
 src/remote/blockingTCPAcceptor.cpp            | 15 ++++++-------
 src/remote/blockingTCPConnector.cpp           | 13 ++++++------
 src/remote/blockingUDPConnector.cpp           |  9 ++++----
 src/remote/blockingUDPTransport.cpp           | 21 ++++++++++---------
 src/remote/simpleChannelSearchManagerImpl.cpp | 12 ++++++-----
 src/remote/transportRegistry.cpp              |  1 +
 src/remoteClient/clientContextImpl.cpp        |  3 ++-
 src/server/baseChannelRequester.cpp           |  1 +
 src/server/beaconEmitter.cpp                  |  8 +++----
 src/server/responseHandlers.cpp               | 13 ++++++------
 src/server/serverChannelImpl.cpp              |  1 +
 src/utils/introspectionRegistry.cpp           |  1 +
 src/utils/referenceCountingLock.cpp           |  1 +
 16 files changed, 65 insertions(+), 49 deletions(-)

diff --git a/src/ca/caChannel.cpp b/src/ca/caChannel.cpp
index 2d6a492..9ea13fa 100644
--- a/src/ca/caChannel.cpp
+++ b/src/ca/caChannel.cpp
@@ -6,9 +6,10 @@
 
 #include <epicsVersion.h>
 
-#include <pv/logger.h>
 #include <pv/standardField.h>
 
+#define epicsExportSharedSymbols
+#include <pv/logger.h>
 #include <pv/caChannel.h>
 #include <pv/caStatus.h>
 
diff --git a/src/remote/abstractResponseHandler.cpp b/src/remote/abstractResponseHandler.cpp
index 76b6262..14d349e 100644
--- a/src/remote/abstractResponseHandler.cpp
+++ b/src/remote/abstractResponseHandler.cpp
@@ -4,14 +4,15 @@
  * in file LICENSE that is included with this distribution.
  */
 
-#include <pv/remote.h>
-#include <pv/hexDump.h>
-
-#include <pv/byteBuffer.h>
+#include <sstream>
 
 #include <osiSock.h>
 
-#include <sstream>
+#include <pv/byteBuffer.h>
+
+#define epicsExportSharedSymbols
+#include <pv/remote.h>
+#include <pv/hexDump.h>
 
 using std::ostringstream;
 using std::hex;
diff --git a/src/remote/beaconHandler.cpp b/src/remote/beaconHandler.cpp
index 21ca28b..2fd41d7 100644
--- a/src/remote/beaconHandler.cpp
+++ b/src/remote/beaconHandler.cpp
@@ -4,6 +4,7 @@
  * in file LICENSE that is included with this distribution.
  */
 
+#define epicsExportSharedSymbols
 #include <pv/beaconHandler.h>
 #include <pv/transportRegistry.h>
 
diff --git a/src/remote/blockingTCPAcceptor.cpp b/src/remote/blockingTCPAcceptor.cpp
index 63fbb28..9938419 100644
--- a/src/remote/blockingTCPAcceptor.cpp
+++ b/src/remote/blockingTCPAcceptor.cpp
@@ -4,18 +4,19 @@
  * in file LICENSE that is included with this distribution.
  */
 
+#include <sstream>
+
+#include <epicsThread.h>
+#include <osiSock.h>
+
+#include <pv/epicsException.h>
+
+#define epicsExportSharedSymbols
 #include <pv/blockingTCP.h>
 #include <pv/codec.h>
 #include <pv/remote.h>
 #include <pv/logger.h>
 
-#include <pv/epicsException.h>
-
-#include <osiSock.h>
-#include <epicsThread.h>
-
-#include <sstream>
-
 using std::ostringstream;
 using namespace epics::pvData;
 
diff --git a/src/remote/blockingTCPConnector.cpp b/src/remote/blockingTCPConnector.cpp
index a1a4de6..fb08e78 100644
--- a/src/remote/blockingTCPConnector.cpp
+++ b/src/remote/blockingTCPConnector.cpp
@@ -4,18 +4,19 @@
  * in file LICENSE that is included with this distribution.
  */
 
+#include <sstream>
+#include <sys/types.h>
+
+#include <osiSock.h>
+#include <epicsThread.h>
+
+#define epicsExportSharedSymbols
 #include <pv/blockingTCP.h>
 #include <pv/remote.h>
 #include <pv/namedLockPattern.h>
 #include <pv/logger.h>
 #include <pv/codec.h>
 
-#include <epicsThread.h>
-#include <osiSock.h>
-
-#include <sys/types.h>
-#include <sstream>
-
 using namespace epics::pvData;
 
 namespace epics {
diff --git a/src/remote/blockingUDPConnector.cpp b/src/remote/blockingUDPConnector.cpp
index ada3cd9..44a447c 100644
--- a/src/remote/blockingUDPConnector.cpp
+++ b/src/remote/blockingUDPConnector.cpp
@@ -4,13 +4,14 @@
  * in file LICENSE that is included with this distribution.
  */
 
-#include <pv/blockingUDP.h>
-#include <pv/remote.h>
-#include <pv/logger.h>
+#include <sys/types.h>
 
 #include <osiSock.h>
 
-#include <sys/types.h>
+#define epicsExportSharedSymbols
+#include <pv/blockingUDP.h>
+#include <pv/remote.h>
+#include <pv/logger.h>
 
 using namespace std;
 using namespace epics::pvData;
diff --git a/src/remote/blockingUDPTransport.cpp b/src/remote/blockingUDPTransport.cpp
index 4ec1456..46c7f90 100644
--- a/src/remote/blockingUDPTransport.cpp
+++ b/src/remote/blockingUDPTransport.cpp
@@ -9,22 +9,23 @@
 #include <ws2tcpip.h>
 #endif
 
+#include <sys/types.h>
+#include <cstdio>
+
+#include <epicsThread.h>
+#include <osiSock.h>
+#include <osdSock.h>
+
+#include <pv/lock.h>
+#include <pv/byteBuffer.h>
+
+#define epicsExportSharedSymbols
 #include <pv/blockingUDP.h>
 #include <pv/pvaConstants.h>
 #include <pv/inetAddressUtil.h>
 #include <pv/logger.h>
 #include <pv/likely.h>
 
-#include <pv/byteBuffer.h>
-#include <pv/lock.h>
-
-#include <osdSock.h>
-#include <osiSock.h>
-#include <epicsThread.h>
-
-#include <cstdio>
-#include <sys/types.h>
-
 using namespace epics::pvData;
 using namespace std;
 using std::tr1::static_pointer_cast;
diff --git a/src/remote/simpleChannelSearchManagerImpl.cpp b/src/remote/simpleChannelSearchManagerImpl.cpp
index 459aade..b889839 100644
--- a/src/remote/simpleChannelSearchManagerImpl.cpp
+++ b/src/remote/simpleChannelSearchManagerImpl.cpp
@@ -4,16 +4,18 @@
  * in file LICENSE that is included with this distribution.
  */
 
+#include <stdlib.h>
+#include <time.h>
+#include <vector>
+
+#include <pv/timeStamp.h>
+
+#define epicsExportSharedSymbols
 #include <pv/simpleChannelSearchManagerImpl.h>
 #include <pv/pvaConstants.h>
 #include <pv/blockingUDP.h>
 #include <pv/serializeHelper.h>
 
-#include <stdlib.h>
-#include <time.h>
-#include <pv/timeStamp.h>
-#include <vector>
-
 using namespace std;
 using namespace epics::pvData;
 
diff --git a/src/remote/transportRegistry.cpp b/src/remote/transportRegistry.cpp
index b7d73b6..69225c3 100644
--- a/src/remote/transportRegistry.cpp
+++ b/src/remote/transportRegistry.cpp
@@ -4,6 +4,7 @@
  * in file LICENSE that is included with this distribution.
  */
 
+#define epicsExportSharedSymbols
 #include <pv/transportRegistry.h>
 
 using namespace epics::pvData;
diff --git a/src/remoteClient/clientContextImpl.cpp b/src/remoteClient/clientContextImpl.cpp
index d6e0910..11587a8 100644
--- a/src/remoteClient/clientContextImpl.cpp
+++ b/src/remoteClient/clientContextImpl.cpp
@@ -13,10 +13,10 @@
 #include <pv/lock.h>
 #include <pv/timer.h>
 #include <pv/bitSetUtil.h>
-#include <pv/serializationHelper.h>
 #include <pv/queue.h>
 #include <pv/standardPVField.h>
 
+#define epicsExportSharedSymbols
 #include <pv/pvAccess.h>
 #include <pv/pvaConstants.h>
 #include <pv/blockingUDP.h>
@@ -26,6 +26,7 @@
 #include <pv/hexDump.h>
 #include <pv/remote.h>
 #include <pv/channelSearchManager.h>
+#include <pv/serializationHelper.h>
 #include <pv/simpleChannelSearchManagerImpl.h>
 #include <pv/clientContextImpl.h>
 #include <pv/configuration.h>
diff --git a/src/server/baseChannelRequester.cpp b/src/server/baseChannelRequester.cpp
index 8418c66..a77945c 100644
--- a/src/server/baseChannelRequester.cpp
+++ b/src/server/baseChannelRequester.cpp
@@ -4,6 +4,7 @@
  * in file LICENSE that is included with this distribution.
  */
 
+#define epicsExportSharedSymbols
 #include <pv/baseChannelRequester.h>
 
 using namespace epics::pvData;
diff --git a/src/server/beaconEmitter.cpp b/src/server/beaconEmitter.cpp
index eca25b7..4b33299 100644
--- a/src/server/beaconEmitter.cpp
+++ b/src/server/beaconEmitter.cpp
@@ -8,12 +8,12 @@
 #define NOMINMAX
 #endif
 
-#include <pv/beaconEmitter.h>
-#include <pv/serializationHelper.h>
-
-#include <pv/logger.h>
 #include <algorithm>
 
+#define epicsExportSharedSymbols
+#include <pv/beaconEmitter.h>
+#include <pv/serializationHelper.h>
+#include <pv/logger.h>
 #include <pv/serverContext.h>
 
 using namespace std;
diff --git a/src/server/responseHandlers.cpp b/src/server/responseHandlers.cpp
index f2c1258..5dfd2d6 100644
--- a/src/server/responseHandlers.cpp
+++ b/src/server/responseHandlers.cpp
@@ -17,17 +17,18 @@
 #include <time.h>
 #include <stdlib.h>
 
+#include <osiSock.h>
+#include <osiProcess.h>
+
+#include <pv/byteBuffer.h>
+#include <pv/timer.h>
+
+#define epicsExportSharedSymbols
 #include <pv/responseHandlers.h>
 #include <pv/remote.h>
 #include <pv/hexDump.h>
 #include <pv/serializationHelper.h>
-
-#include <pv/byteBuffer.h>
-
-#include <osiSock.h>
-#include <osiProcess.h>
 #include <pv/logger.h>
-
 #include <pv/pvAccessMB.h>
 #include <pv/rpcServer.h>
 #include <pv/security.h>
diff --git a/src/server/serverChannelImpl.cpp b/src/server/serverChannelImpl.cpp
index a8204d7..db08f83 100644
--- a/src/server/serverChannelImpl.cpp
+++ b/src/server/serverChannelImpl.cpp
@@ -4,6 +4,7 @@
  * in file LICENSE that is included with this distribution.
  */
 
+#define epicsExportSharedSymbols
 #include <pv/serverChannelImpl.h>
 
 using namespace epics::pvData;
diff --git a/src/utils/introspectionRegistry.cpp b/src/utils/introspectionRegistry.cpp
index 87917e0..0d25665 100644
--- a/src/utils/introspectionRegistry.cpp
+++ b/src/utils/introspectionRegistry.cpp
@@ -4,6 +4,7 @@
  * in file LICENSE that is included with this distribution.
  */
 
+#define epicsExportSharedSymbols
 #include <pv/introspectionRegistry.h>
 #include <pv/serializationHelper.h>
 
diff --git a/src/utils/referenceCountingLock.cpp b/src/utils/referenceCountingLock.cpp
index a4c4149..e2c1e74 100644
--- a/src/utils/referenceCountingLock.cpp
+++ b/src/utils/referenceCountingLock.cpp
@@ -4,6 +4,7 @@
  * in file LICENSE that is included with this distribution.
  */
 
+#define epicsExportSharedSymbols
 #include <pv/referenceCountingLock.h>
 
 namespace epics {