wrong ifdef

2019-06-23 07:22:27 -04:00
parent 3b6f23515f
commit bc6fd2b9ff
5 changed files with 15 additions and 10 deletions
--- a/src/copy/pv/pvArrayPlugin.h
+++ b/src/copy/pv/pvArrayPlugin.h
@ -6,8 +6,9 @@
 #ifndef PVARRAYPLUGIN_H
 #define PVARRAYPLUGIN_H

-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
+#ifdef epicsExportSharedSymbols
+#   define pvaConstantsepicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
 #endif

 #include <string>
--- a/src/copy/pv/pvDeadbandPlugin.h
+++ b/src/copy/pv/pvDeadbandPlugin.h
@ -6,8 +6,9 @@
 #ifndef PVDEADBANDPLUGIN_H
 #define PVDEADBANDPLUGIN_H

-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
+#ifdef epicsExportSharedSymbols
+#   define pvaConstantsepicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
 #endif

 #include <string>
--- a/src/copy/pv/pvPlugin.h
+++ b/src/copy/pv/pvPlugin.h
@ -9,8 +9,9 @@
 #ifndef PVPLUGIN_H
 #define PVPLUGIN_H

-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
+#ifdef epicsExportSharedSymbols
+#   define pvaConstantsepicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
 #endif

 #include <string>
--- a/src/copy/pv/pvStructureCopy.h
+++ b/src/copy/pv/pvStructureCopy.h
@ -10,8 +10,9 @@
 #ifndef PVSTRUCTURECOPY_H
 #define PVSTRUCTURECOPY_H

-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
+#ifdef epicsExportSharedSymbols
+#   define pvaConstantsepicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
 #endif

 #include <string>
--- a/src/copy/pv/pvTimestampPlugin.h
+++ b/src/copy/pv/pvTimestampPlugin.h
@ -6,8 +6,9 @@
 #ifndef PVTIMESTAMPPLUGIN_H
 #define PVTIMESTAMPPLUGIN_H

-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
+#ifdef epicsExportSharedSymbols
+#   define pvaConstantsepicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
 #endif

 #include <string>