win support port

src/pvaClient.cpp

@@ -9,13 +9,15 @@
  * @date 2015.02
  */
 
-#define epicsExportSharedSymbols
 #include <map>
-#include <pv/pvaClient.h>
 #include <pv/createRequest.h>
 #include <pv/clientFactory.h>
 #include <pv/caProvider.h>
 
+#define epicsExportSharedSymbols
+
+#include <pv/pvaClient.h>
+
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/pvaClientChannel.cpp

@@ -8,14 +8,15 @@
  * @author mrk
  * @date 2015.02
  */
-#define epicsExportSharedSymbols
 
 #include <map>
 #include <pv/event.h>
 #include <pv/lock.h>
-#include <pv/pvaClient.h>
 #include <pv/createRequest.h>
 
+#define epicsExportSharedSymbols
+
+#include <pv/pvaClient.h>
 
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

src/pvaClientGet.cpp

@@ -8,9 +8,11 @@
  * @author mrk
  * @date 2015.02
  */
-#define epicsExportSharedSymbols
 
 #include <pv/event.h>
+
+#define epicsExportSharedSymbols
+
 #include <pv/pvaClient.h>
 
 using std::tr1::static_pointer_cast;

src/pvaClientGetData.cpp

@@ -8,15 +8,16 @@
  * @author mrk
  * @date 2015.02
  */
-#define epicsExportSharedSymbols
 
 #include <typeinfo>
-
 #include <sstream>
-#include <pv/pvaClient.h>
+
 #include <pv/createRequest.h>
 #include <pv/convert.h>
 
+#define epicsExportSharedSymbols
+
+#include <pv/pvaClient.h>
 
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

src/pvaClientMonitor.cpp

@@ -8,13 +8,15 @@
  * @author mrk
  * @date 2015.03
  */
-#define epicsExportSharedSymbols
 
 #include <sstream>
 #include <pv/event.h>
-#include <pv/pvaClient.h>
 #include <pv/bitSetUtil.h>
 
+#define epicsExportSharedSymbols
+
+#include <pv/pvaClient.h>
+
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/pvaClientMonitorData.cpp

@@ -8,15 +8,16 @@
  * @author mrk
  * @date 2015.02
  */
-#define epicsExportSharedSymbols
 
 #include <typeinfo>
-
 #include <sstream>
-#include <pv/pvaClient.h>
+
 #include <pv/createRequest.h>
 #include <pv/convert.h>
 
+#define epicsExportSharedSymbols
+
+#include <pv/pvaClient.h>
 
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

src/pvaClientMultiChannel.cpp

@@ -8,11 +8,13 @@
  * @author mrk
  * @date 2015.02
  */
-#define epicsExportSharedSymbols
 
 #include <map>
 #include <pv/event.h>
 #include <pv/lock.h>
+
+#define epicsExportSharedSymbols
+
 #include <pv/pvaClientMultiChannel.h>
 
 

src/pvaClientMultiChannel.h

@@ -12,14 +12,21 @@
 #define PVACLIENTMULTICHANNEL_H
 
 #ifdef epicsExportSharedSymbols
-#   define pvaClientEpicsExportSharedSymbols
+#   define pvaClientMultiChannelEpicsExportSharedSymbols
 #   undef epicsExportSharedSymbols
 #endif
 
-#include <pv/pvaClient.h>
 #include <pv/ntmultiChannel.h>
 #include <pv/createRequest.h>
 
+#ifdef pvaClientMultiChannelEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef pvaClientMultiChannelEpicsExportSharedSymbols
+#endif
+
+
+#include <pv/pvaClient.h>
+
 
 namespace epics { namespace pvaClient { 
 

src/pvaClientMultiGetDouble.cpp

@@ -9,12 +9,14 @@
  * @date 2015.03
  */
 
-#define epicsExportSharedSymbols
-#include <pv/pvaClientMultiChannel.h>
 #include <pv/standardField.h>
 #include <pv/convert.h>
 #include <epicsMath.h>
 
+#define epicsExportSharedSymbols
+
+#include <pv/pvaClientMultiChannel.h>
+
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/pvaClientMultiMonitorDouble.cpp

@@ -9,13 +9,15 @@
  * @date 2015.03
  */
 
-#define epicsExportSharedSymbols
 #include <epicsThread.h>
-#include <pv/pvaClientMultiChannel.h>
 #include <pv/standardField.h>
 #include <pv/convert.h>
 #include <epicsMath.h>
 
+#define epicsExportSharedSymbols
+
+#include <pv/pvaClientMultiChannel.h>
+
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/pvaClientMultiPutDouble.cpp

@@ -9,12 +9,14 @@
  * @date 2015.03
  */
 
-#define epicsExportSharedSymbols
-#include <pv/pvaClientMultiChannel.h>
 #include <pv/standardField.h>
 #include <pv/convert.h>
 #include <epicsMath.h>
 
+#define epicsExportSharedSymbols
+
+#include <pv/pvaClientMultiChannel.h>
+
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/pvaClientNTMultiData.cpp

@@ -9,10 +9,12 @@
  * @date 2015.03
  */
 
-#define epicsExportSharedSymbols
-#include <pv/pvaClientMultiChannel.h>
 #include <epicsMath.h>
 
+#define epicsExportSharedSymbols
+
+#include <pv/pvaClientMultiChannel.h>
+
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/pvaClientNTMultiGet.cpp

@@ -9,12 +9,14 @@
  * @date 2015.03
  */
 
-#define epicsExportSharedSymbols
-#include <pv/pvaClientMultiChannel.h>
 #include <pv/standardField.h>
 #include <pv/convert.h>
 #include <epicsMath.h>
 
+#define epicsExportSharedSymbols
+
+#include <pv/pvaClientMultiChannel.h>
+
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/pvaClientNTMultiMonitor.cpp

@@ -9,13 +9,15 @@
  * @date 2015.03
  */
 
-#define epicsExportSharedSymbols
 #include <epicsThread.h>
-#include <pv/pvaClientMultiChannel.h>
 #include <pv/standardField.h>
 #include <pv/convert.h>
 #include <epicsMath.h>
 
+#define epicsExportSharedSymbols
+
+#include <pv/pvaClientMultiChannel.h>
+
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/pvaClientNTMultiPut.cpp

@@ -9,12 +9,14 @@
  * @date 2015.03
  */
 
-#define epicsExportSharedSymbols
-#include <pv/pvaClientMultiChannel.h>
 #include <pv/standardField.h>
 #include <pv/convert.h>
 #include <epicsMath.h>
 
+#define epicsExportSharedSymbols
+
+#include <pv/pvaClientMultiChannel.h>
+
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvAccess;

src/pvaClientProcess.cpp

@@ -8,9 +8,11 @@
  * @author mrk
  * @date 2015.02
  */
-#define epicsExportSharedSymbols
 
 #include <pv/event.h>
+
+#define epicsExportSharedSymbols
+
 #include <pv/pvaClient.h>
 
 using std::tr1::static_pointer_cast;

src/pvaClientPut.cpp

@@ -8,9 +8,11 @@
  * @author mrk
  * @date 2015.02
  */
-#define epicsExportSharedSymbols
 
 #include <pv/event.h>
+
+#define epicsExportSharedSymbols
+
 #include <pv/pvaClient.h>
 
 using std::tr1::static_pointer_cast;

src/pvaClientPutData.cpp

@@ -8,15 +8,16 @@
  * @author mrk
  * @date 2015.02
  */
-#define epicsExportSharedSymbols
 
 #include <typeinfo>
-
 #include <sstream>
-#include <pv/pvaClient.h>
+
 #include <pv/createRequest.h>
 #include <pv/convert.h>
 
+#define epicsExportSharedSymbols
+
+#include <pv/pvaClient.h>
 
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;

src/pvaClientPutGet.cpp

@@ -8,9 +8,10 @@
  * @author mrk
  * @date 2015.02
  */
+#include <pv/event.h>
+
 #define epicsExportSharedSymbols
 
-#include <pv/event.h>
 #include <pv/pvaClient.h>
 
 using std::tr1::static_pointer_cast;