Win32 port: import/export headers

pvDataApp/factory/StandardField.cpp

@@ -10,8 +10,6 @@
 #include <string>
 #include <cstdio>
 #include <stdexcept>
-#include <epicsThread.h>
-#include <epicsExit.h>
 
 #define epicsExportSharedSymbols
 #include <pv/lock.h>

pvDataApp/factory/StandardPVField.cpp

@@ -9,8 +9,6 @@
  */
 #include <string>
 #include <stdexcept>
-#include <epicsThread.h>
-#include <epicsExit.h>
 
 #define epicsExportSharedSymbols
 #include <pv/lock.h>

pvDataApp/misc/byteBuffer.h

@@ -12,8 +12,6 @@
 
 #include <string>
 #include <string.h>
-#include <pv/pvType.h>
-#include <pv/epicsException.h>
 
 #ifdef epicsExportSharedSymbols
 #define byteBufferepicsExportSharedSymbols
@@ -26,6 +24,10 @@
 #define epicsExportSharedSymbols
 #undef byteBufferepicsExportSharedSymbols
 #endif
+
+#include <pv/pvType.h>
+#include <pv/epicsException.h>
+
 #include <shareLib.h>
 
 namespace epics { 

pvDataApp/misc/event.h

@@ -12,8 +12,19 @@
 
 #include <memory>
 #include <vector>
+
+#ifdef epicsExportSharedSymbols
+#define eventepicsExportSharedSymbols
+#undef epicsExportSharedSymbols
+#endif
+
 #include <epicsEvent.h>
 
+#ifdef eventepicsExportSharedSymbols
+#define epicsExportSharedSymbols
+#undef eventepicsExportSharedSymbols
+#endif
+
 #include <pv/pvType.h>
 #include <pv/sharedPtr.h>
 

pvDataApp/misc/lock.h

@@ -11,8 +11,19 @@
 #define LOCK_H
 
 #include <stdexcept>
+
+#ifdef epicsExportSharedSymbols
+#define lockepicsExportSharedSymbols
+#undef epicsExportSharedSymbols
+#endif
+
 #include <epicsMutex.h>
 
+#ifdef lockepicsExportSharedSymbols
+#define epicsExportSharedSymbols
+#undef lockepicsExportSharedSymbols
+#endif
+
 #include <pv/noDefaultMethods.h>
 
 #include <shareLib.h>

pvDataApp/misc/thread.h

@@ -12,8 +12,18 @@
 
 #include <memory>
 
+#ifdef epicsExportSharedSymbols
+#define threadepicsExportSharedSymbols
+#undef epicsExportSharedSymbols
+#endif
+
 #include <epicsThread.h>
 
+#ifdef threadepicsExportSharedSymbols
+#define epicsExportSharedSymbols
+#undef threadepicsExportSharedSymbols
+#endif
+
 #include <pv/noDefaultMethods.h>
 #include <pv/pvType.h>
 

pvDataApp/misc/typeCast.h

@@ -10,8 +10,18 @@
 #include <stdexcept>
 #include <sstream>
 
+#ifdef epicsExportSharedSymbols
+#define typeCastepicsExportSharedSymbols
+#undef epicsExportSharedSymbols
+#endif
+
 #include <epicsConvert.h>
 
+#ifdef typeCastepicsExportSharedSymbols
+#define epicsExportSharedSymbols
+#undef typeCastepicsExportSharedSymbols
+#endif
+
 #include <pv/pvType.h>
 #include <pv/pvIntrospect.h>
 #include <pv/templateMeta.h>

pvDataApp/property/timeStamp.h

@@ -11,8 +11,19 @@
 #define TIMESTAMP_H
 
 #include <ctime>
+
+#ifdef epicsExportSharedSymbols
+#define timeStampepicsExportSharedSymbols
+#undef epicsExportSharedSymbols
+#endif
+
 #include <epicsTime.h>
 
+#ifdef timeStampepicsExportSharedSymbols
+#define epicsExportSharedSymbols
+#undef timeStampepicsExportSharedSymbols
+#endif
+
 #include <pv/pvType.h>
 
 #include <shareLib.h>

testApp/misc/testSerialization.cpp

@@ -9,6 +9,9 @@
  *  Created on: Oct 25, 2010
  *      Author: Miha Vitorovic
  */
+#ifdef _WIN32
+#define NOMINMAX
+#endif
 #include <iostream>
 #include <fstream>