Merged Windows port changes from default branch.

test/src/powerSupply.cpp

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

test/src/powerSupply.h

@@ -11,19 +11,32 @@
 #ifndef POWERSUPPLY_H
 #define POWERSUPPLY_H
 
-#include <shareLib.h>
+//#include <shareLib.h>
+
+#ifdef epicsExportSharedSymbols
+#   define powersupplyEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
 
-#include <pv/pvDatabase.h>
 #include <pv/timeStamp.h>
-#include <pv/alarm.h>
 #include <pv/pvTimeStamp.h>
+#include <pv/pvDatabase.h>
+#include <pv/alarm.h>
 #include <pv/pvAlarm.h>
 
+
+#ifdef powersupplyEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#	undef powersupplyEpicsExportSharedSymbols
+#   include <shareLib.h>
+#endif
+
+
 namespace epics { namespace pvDatabase { 
 
 epicsShareExtern epics::pvData::PVStructurePtr createPowerSupply();
 
-class PowerSupply;
+class epicsShareClass PowerSupply;
 typedef std::tr1::shared_ptr<PowerSupply> PowerSupplyPtr;
 
 class PowerSupply :

test/src/testExampleRecord.cpp

@@ -23,7 +23,6 @@
 #include <epicsEvent.h>
 #include <epicsThread.h>
 
-#include <epicsExport.h>
 
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
@@ -31,6 +30,10 @@
 #include <pv/pvAccess.h>
 #include "powerSupply.h"
 
+#define epicsExportSharedSymbols
+#include <epicsExport.h>
+
+
 using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;