Remove remaining 'undef epicsExportSharedSymbols' stuff

src/copy/createRequest.cpp

@@ -7,6 +7,8 @@
 #include <string>
 #include <sstream>
 
+#include <epicsMutex.h>
+
 #define epicsExportSharedSymbols
 
 #include <pv/pvData.h>

src/copy/pvCopy.cpp

@@ -13,6 +13,8 @@
 #include <memory>
 #include <sstream>
 
+#include <epicsThread.h>
+
 #define epicsExportSharedSymbols
 
 #include <pv/thread.h>

src/factory/Convert.cpp

@@ -13,6 +13,8 @@
 #include <stdexcept>
 #include <typeinfo>
 
+#include <epicsMutex.h>
+
 #define epicsExportSharedSymbols
 #include <pv/lock.h>
 #include <pv/pvIntrospect.h>

src/factory/FieldCreateFactory.cpp

@@ -19,6 +19,8 @@
 #include <stdexcept>
 #include <sstream>
 
+#include <epicsMutex.h>
+
 #define epicsExportSharedSymbols
 #include <pv/lock.h>
 #include <pv/pvIntrospect.h>

src/factory/PVDataCreateFactory.cpp

@@ -17,6 +17,8 @@
 #include <string>
 #include <cstdio>
 
+#include <epicsMutex.h>
+
 #define epicsExportSharedSymbols
 #include <pv/lock.h>
 #include <pv/pvIntrospect.h>

src/factory/PVField.cpp

@@ -12,6 +12,8 @@
 #include <string>
 #include <cstdio>
 
+#include <epicsMutex.h>
+
 #define epicsExportSharedSymbols
 #include <pv/lock.h>
 #include <pv/pvData.h>

src/factory/StandardField.cpp

@@ -11,6 +11,8 @@
 #include <cstdio>
 #include <stdexcept>
 
+#include <epicsMutex.h>
+
 #define epicsExportSharedSymbols
 #include <pv/lock.h>
 #include <pv/pvIntrospect.h>

src/factory/StandardPVField.cpp

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

src/misc/bitSet.cpp

@@ -10,9 +10,10 @@
 #include <string.h>
 #include <stdio.h>
 #include <iostream>
-
 #include <stdexcept>
 
+#include <epicsMutex.h>
+
 #define epicsExportSharedSymbols
 #include <pv/lock.h>
 #include <pv/serializeHelper.h>

src/misc/byteBuffer.cpp

@@ -6,3 +6,6 @@
 /**
  *  @author mse
  */
+
+#define epicsExportSharedSymbols
+#include <pv/byteBuffer.h>

src/misc/pv/byteBuffer.h

@@ -14,22 +14,12 @@
 #include <cstring>
 #include <cstdlib>
 
-#ifdef epicsExportSharedSymbols
-#define byteBufferepicsExportSharedSymbols
-#undef epicsExportSharedSymbols
-#endif
-
 #include <epicsEndian.h>
-
-#ifdef byteBufferepicsExportSharedSymbols
-#define epicsExportSharedSymbols
-#undef byteBufferepicsExportSharedSymbols
-#endif
+#include <shareLib.h>
 
 #include <pv/pvType.h>
 #include <pv/epicsException.h>
 
-#include <shareLib.h>
 
 namespace epics { 
     namespace pvData {

src/misc/pv/event.h

@@ -13,22 +13,12 @@
 #include <memory>
 #include <vector>
 
-#ifdef epicsExportSharedSymbols
-#define eventepicsExportSharedSymbols
-#undef epicsExportSharedSymbols
-#endif
-
 #include <epicsEvent.h>
-
-#ifdef eventepicsExportSharedSymbols
-#define epicsExportSharedSymbols
-#undef eventepicsExportSharedSymbols
-#endif
+#include <shareLib.h>
 
 #include <pv/pvType.h>
 #include <pv/sharedPtr.h>
 
-#include <shareLib.h>
 
 namespace epics { namespace pvData { 
 

src/misc/pv/lock.h

@@ -12,21 +12,11 @@
 
 #include <stdexcept>
 
-#ifdef epicsExportSharedSymbols
-#define lockepicsExportSharedSymbols
-#undef epicsExportSharedSymbols
-#endif
-
 #include <epicsMutex.h>
-
-#ifdef lockepicsExportSharedSymbols
-#define epicsExportSharedSymbols
-#undef lockepicsExportSharedSymbols
-#endif
+#include <shareLib.h>
 
 #include <pv/noDefaultMethods.h>
 
-#include <shareLib.h>
 
 /* This is based on item 14 of 
  * Effective C++, Third Edition, Scott Meyers

src/misc/pv/thread.h

@@ -17,22 +17,12 @@
 #include <functional>
 #endif
 
-#ifdef epicsExportSharedSymbols
-#define threadepicsExportSharedSymbols
-#undef epicsExportSharedSymbols
-#endif
-
 #include <epicsThread.h>
-
-#ifdef threadepicsExportSharedSymbols
-#define epicsExportSharedSymbols
-#undef threadepicsExportSharedSymbols
-#endif
+#include <shareLib.h>
 
 #include <pv/noDefaultMethods.h>
 #include <pv/pvType.h>
 
-#include <shareLib.h>
 
 namespace epics { namespace pvData {
 

src/misc/pv/typeCast.h

@@ -10,23 +10,13 @@
 #include <stdexcept>
 #include <sstream>
 
-#ifdef epicsExportSharedSymbols
-#define typeCastepicsExportSharedSymbols
-#undef epicsExportSharedSymbols
-#endif
-
 #include <epicsConvert.h>
-
-#ifdef typeCastepicsExportSharedSymbols
-#define epicsExportSharedSymbols
-#undef typeCastepicsExportSharedSymbols
-#endif
+#include <shareLib.h>
 
 #include <pv/pvType.h>
 #include <pv/pvIntrospect.h>
 #include <pv/templateMeta.h>
 
-#include <shareLib.h>
 
 namespace epics { namespace pvData {
 

src/misc/requester.cpp

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

src/misc/serializeHelper.cpp

@@ -12,6 +12,8 @@
 
 #include <algorithm>
 
+#include <epicsEndian.h>
+
 #define epicsExportSharedSymbols
 #include <pv/pvType.h>
 #include <pv/byteBuffer.h>

src/misc/timeFunction.cpp

@@ -13,6 +13,8 @@
 #include <string>
 #include <cstdio>
 
+#include <epicsTime.h>
+
 #define epicsExportSharedSymbols
 #include <pv/pvType.h>
 #include <pv/timeStamp.h>

src/misc/typeCast.cpp

@@ -7,6 +7,8 @@
 #include <algorithm>
 #include <sstream>
 
+#include <epicsConvert.h>
+
 #define epicsExportSharedSymbols
 #include "pv/typeCast.h"
 

src/property/alarm.cpp

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

src/property/pv/timeStamp.h

@@ -12,21 +12,11 @@
 
 #include <ctime>
 
-#ifdef epicsExportSharedSymbols
-#define timeStampepicsExportSharedSymbols
-#undef epicsExportSharedSymbols
-#endif
-
 #include <epicsTime.h>
-
-#ifdef timeStampepicsExportSharedSymbols
-#define epicsExportSharedSymbols
-#undef timeStampepicsExportSharedSymbols
-#endif
+#include <shareLib.h>
 
 #include <pv/pvType.h>
 
-#include <shareLib.h>
 
 namespace epics { namespace pvData {