win32 compilation of test and examples

arrayPerformance/src/arrayPerformance.h

@@ -17,7 +17,6 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include <shareLib.h>
 #include <epicsThread.h>
 #include <pv/standardPVField.h>
 #include <pv/timeStamp.h>

arrayPerformance/src/longArrayGet.h

@@ -17,8 +17,6 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include <shareLib.h>
-
 #include <pv/event.h>
 #include <pv/lock.h>
 #include <pv/standardPVField.h>

arrayPerformance/src/longArrayMonitor.h

@@ -16,7 +16,6 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include <shareLib.h>
 #include <pv/event.h>
 #include <pv/lock.h>
 #include <pv/standardPVField.h>

arrayPerformance/src/longArrayPut.h

@@ -17,7 +17,6 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include <shareLib.h>
 #include <pv/event.h>
 #include <pv/lock.h>
 #include <pv/standardPVField.h>

exampleDatabase/src/exampleDatabase.cpp

@@ -27,6 +27,8 @@
 #include <pv/traceRecord.h>
 
 #include <pv/powerSupply.h>
+
+#define epicsExportSharedSymbols
 #include <pv/exampleDatabase.h>
 
 using namespace std;

exampleDatabase/src/exampleDatabase.h

@@ -16,15 +16,15 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include <shareLib.h>
 #include <pv/pvDatabase.h>
 
 #ifdef exampledatabaseEpicsExportSharedSymbols
 #   define epicsExportSharedSymbols
 #	undef exampledatabaseEpicsExportSharedSymbols
-#   include <shareLib.h>
 #endif
 
+#include <shareLib.h>
+
 namespace epics { namespace pvDatabase { 
 
 class epicsShareClass  ExampleDatabase{

exampleDatabase/src/exampleDatabaseRegister.cpp

@@ -31,9 +31,8 @@
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
 
-#include <pv/exampleDatabase.h>
-
 #include <epicsExport.h>
+#include <pv/exampleDatabase.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

exampleDatabase/src/exampleMonitorPlugin.cpp

@@ -11,6 +11,8 @@
 
 #include <pv/convert.h>
 #include <pv/monitorPlugin.h>
+
+#define epicsExportSharedSymbols
 #include <pv/exampleMonitorPlugin.h>
 
 using namespace epics::pvData;

exampleDatabase/src/exampleMonitorPlugin.h

@@ -11,9 +11,20 @@
 #ifndef EXAMPLEMONITORPLUGIN_H
 #define EXAMPLEMONITORPLUGIN_H
 
-#include <shareLib.h>
+#ifdef epicsExportSharedSymbols
+#   define examplemonitorPluginEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
 
 #include <pv/pvDatabase.h>
+
+#ifdef examplemonitorPluginEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef examplemonitorPluginEpicsExportSharedSymbols
+#endif
+
+#include <shareLib.h>
+
 #include <pv/monitorPlugin.h>
 
 namespace epics { namespace pvDatabase { 

exampleDatabase/src/exampleMonitorPluginRegister.cpp

@@ -31,9 +31,9 @@
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
 
+#include <epicsExport.h>
 #include <pv/exampleMonitorPlugin.h>
 
-#include <epicsExport.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

exampleLink/src/exampleLink.cpp

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

exampleLink/src/exampleLink.h

@@ -11,7 +11,10 @@
 #ifndef EXAMPLEPVADOUBLEARRAYGET_H
 #define EXAMPLEPVADOUBLEARRAYGET_H
 
-#include <shareLib.h>
+#ifdef epicsExportSharedSymbols
+#   define exampleLinkEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
 
 #include <pv/timeStamp.h>
 #include <pv/pvTimeStamp.h>
@@ -22,6 +25,13 @@
 #include <pv/pvAccess.h>
 #include <pv/serverContext.h>
 
+#ifdef exampleLinkEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef exampleLinkEpicsExportSharedSymbols
+#endif
+
+#include <shareLib.h>
+
 namespace epics { namespace pvDatabase { 
 
 

exampleLink/src/exampleLinkRegister.cpp

@@ -34,9 +34,8 @@
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
 
-#include <pv/exampleLink.h>
-
 #include <epicsExport.h>
+#include <pv/exampleLink.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

exampleServer/src/exampleServer.cpp

@@ -10,6 +10,8 @@
  */
 
 #include <pv/standardField.h>
+
+#define epicsExportSharedSymbols
 #include <pv/exampleServer.h>
 
 using namespace epics::pvData;

exampleServer/src/exampleServer.h

@@ -11,12 +11,23 @@
 #ifndef EXAMPLECOUNTER_H
 #define EXAMPLECOUNTER_H
 
-#include <shareLib.h>
+#ifdef epicsExportSharedSymbols
+#   define exampleServerEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
 
 #include <pv/pvDatabase.h>
 #include <pv/timeStamp.h>
 #include <pv/pvTimeStamp.h>
 
+#ifdef exampleServerEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef exampleServerEpicsExportSharedSymbols
+#endif
+
+#include <shareLib.h>
+
+
 namespace epics { namespace exampleServer { 
 
 

exampleServer/src/exampleServerRegister.cpp

@@ -33,9 +33,8 @@
 #include <pv/pvDatabase.h>
 #include <pv/recordList.h>
 
-#include <pv/exampleServer.h>
-
 #include <epicsExport.h>
+#include <pv/exampleServer.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;

test/src/powerSupply.cpp

@@ -9,10 +9,12 @@
  * @date 2013.04.02
  */
 
-#include "powerSupply.h"
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
 
+#define epicsExportSharedSymbols
+#include "powerSupply.h"
+
 using namespace epics::pvData;
 using std::string;
 using std::cout;

test/src/powerSupply.h

@@ -11,13 +11,25 @@
 #ifndef POWERSUPPLY_H
 #define POWERSUPPLY_H
 
-#include <shareLib.h>
 
-#include <pv/pvDatabase.h>
+#ifdef epicsExportSharedSymbols
+#   define powerSupplyEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
 #include <pv/timeStamp.h>
 #include <pv/alarm.h>
 #include <pv/pvTimeStamp.h>
 #include <pv/pvAlarm.h>
+#include <pv/pvDatabase.h>
+
+#ifdef powerSupplyEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef powerSupplyEpicsExportSharedSymbols
+#endif
+
+#include <shareLib.h>
+
 
 namespace epics { namespace pvDatabase { 
 

test/src/powerSupplyRegister.cpp

@@ -31,9 +31,9 @@
 #include <pv/pvData.h>
 #include <pv/pvAccess.h>
 #include <pv/pvDatabase.h>
-#include <pv/powerSupply.h>
 
 #include <epicsExport.h>
+#include <pv/powerSupply.h>
 
 using namespace epics::pvData;
 using namespace epics::pvAccess;