From f1553cc90ebea75d4ed6956e8deb94062e642e19 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Mon, 28 May 2018 11:24:19 -0700
Subject: [PATCH] Move NOMINMAX to configure/CONFIG_SITE

The macro must be defined before MS system headers are
included.

This rev. remove #define NOMINMAX from public headers,
but no public headers use min()/max() and this was
never the correct way to use this macro as by convention
library headers are included after system headers,
which is too late to have an effect.
---
 configure/CONFIG_SITE               | 3 +++
 src/factory/FieldCreateFactory.cpp  | 4 ----
 src/factory/PVDataCreateFactory.cpp | 4 ----
 src/misc/pv/epicsException.h        | 4 ----
 src/misc/pv/sharedVector.h          | 4 ----
 src/misc/timer.cpp                  | 4 ----
 src/pv/pvData.h                     | 4 ----
 src/pv/pvType.h                     | 4 ----
 testApp/misc/testBitSet.cpp         | 4 ----
 testApp/misc/testSerialization.cpp  | 4 ----
 testApp/misc/testTypeCast.cpp       | 4 ----
 11 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index 64fc0fd..83393b9 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -23,6 +23,9 @@ CHECK_RELEASE = YES
 -include $(TOP)/../CONFIG_SITE.local
 -include $(TOP)/configure/CONFIG_SITE.local
 
+# MSVC - skip defining min()/max() macros
+USR_CPPFLAGS_WIN32 += -DNOMINMAX
+
 ifdef WITH_COVERAGE
 USR_CPPFLAGS += --coverage
 USR_LDFLAGS += --coverage
diff --git a/src/factory/FieldCreateFactory.cpp b/src/factory/FieldCreateFactory.cpp
index 1104a65..864dd22 100644
--- a/src/factory/FieldCreateFactory.cpp
+++ b/src/factory/FieldCreateFactory.cpp
@@ -7,10 +7,6 @@
  *  @author mrk
  */
 
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
 #include <cstddef>
 #include <cstdlib>
 #include <string>
diff --git a/src/factory/PVDataCreateFactory.cpp b/src/factory/PVDataCreateFactory.cpp
index aaec7ee..53c4854 100644
--- a/src/factory/PVDataCreateFactory.cpp
+++ b/src/factory/PVDataCreateFactory.cpp
@@ -7,10 +7,6 @@
  *  @author mrk
  */
 
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
 #include <cstddef>
 #include <cstdlib>
 #include <string>
diff --git a/src/misc/pv/epicsException.h b/src/misc/pv/epicsException.h
index 9e7c4f8..6f2ebf6 100644
--- a/src/misc/pv/epicsException.h
+++ b/src/misc/pv/epicsException.h
@@ -33,10 +33,6 @@
 #ifndef EPICSEXCEPTION_H_
 #define EPICSEXCEPTION_H_
 
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
 #include <stdexcept>
 #include <string>
 #include <cstdio>
diff --git a/src/misc/pv/sharedVector.h b/src/misc/pv/sharedVector.h
index 278f543..66236b3 100644
--- a/src/misc/pv/sharedVector.h
+++ b/src/misc/pv/sharedVector.h
@@ -6,10 +6,6 @@
 #ifndef SHAREDVECTOR_H
 #define SHAREDVECTOR_H
 
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
 #include <ostream>
 #include <algorithm>
 #include <stdexcept>
diff --git a/src/misc/timer.cpp b/src/misc/timer.cpp
index cc59f99..a4e601e 100644
--- a/src/misc/timer.cpp
+++ b/src/misc/timer.cpp
@@ -6,10 +6,6 @@
 /**
  *  @author mrk
  */
- 
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
 
 #include <stdexcept>
 #include <string>
diff --git a/src/pv/pvData.h b/src/pv/pvData.h
index 4c0a709..d9e87b7 100644
--- a/src/pv/pvData.h
+++ b/src/pv/pvData.h
@@ -9,10 +9,6 @@
 #ifndef PVDATA_H
 #define PVDATA_H
 
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
 #include <string>
 #include <map>
 #include <stdexcept>
diff --git a/src/pv/pvType.h b/src/pv/pvType.h
index efa4052..46f3a75 100644
--- a/src/pv/pvType.h
+++ b/src/pv/pvType.h
@@ -14,10 +14,6 @@
 #ifndef PVTYPE_H
 #define PVTYPE_H
 
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
 #if defined(_WIN32) && !defined(_MINGW)
 #pragma warning( push )
 #pragma warning(disable: 4251)
diff --git a/testApp/misc/testBitSet.cpp b/testApp/misc/testBitSet.cpp
index 1fd55d0..ff358f0 100644
--- a/testApp/misc/testBitSet.cpp
+++ b/testApp/misc/testBitSet.cpp
@@ -5,10 +5,6 @@
  */
 /* Author:  Matej Sekoranja Date: 2010.10.18 */
 
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
 #include <iostream>
 #include <iomanip>
 #include <stddef.h>
diff --git a/testApp/misc/testSerialization.cpp b/testApp/misc/testSerialization.cpp
index 22376ad..04b8784 100644
--- a/testApp/misc/testSerialization.cpp
+++ b/testApp/misc/testSerialization.cpp
@@ -9,10 +9,6 @@
  *      Author: Miha Vitorovic
  */
 
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
 #include <iostream>
 #include <fstream>
 
diff --git a/testApp/misc/testTypeCast.cpp b/testApp/misc/testTypeCast.cpp
index 85b34b7..4ad77be 100644
--- a/testApp/misc/testTypeCast.cpp
+++ b/testApp/misc/testTypeCast.cpp
@@ -4,10 +4,6 @@
  */
 /* Author:  Michael Davidsaver */
 
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
 #include <fstream>
 #include <iostream>
 #include <algorithm>