From 5c16357fe2f79a6f825f2a748fa7003cbe834c3a Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Fri, 5 Feb 2016 13:35:15 -0600
Subject: [PATCH] Don't redefine NOMINMAX (clean up MinGW warnings)

---
 src/factory/FieldCreateFactory.cpp  | 2 +-
 src/factory/PVDataCreateFactory.cpp | 2 +-
 src/misc/pv/epicsException.h        | 3 ++-
 src/misc/pv/sharedVector.h          | 2 +-
 src/misc/timer.cpp                  | 2 +-
 src/pv/pvData.h                     | 2 +-
 src/pv/pvType.h                     | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/factory/FieldCreateFactory.cpp b/src/factory/FieldCreateFactory.cpp
index 7551315..374fdd3 100644
--- a/src/factory/FieldCreateFactory.cpp
+++ b/src/factory/FieldCreateFactory.cpp
@@ -8,7 +8,7 @@
  *  @author mrk
  */
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif
 
diff --git a/src/factory/PVDataCreateFactory.cpp b/src/factory/PVDataCreateFactory.cpp
index a622384..0a9e4c0 100644
--- a/src/factory/PVDataCreateFactory.cpp
+++ b/src/factory/PVDataCreateFactory.cpp
@@ -8,7 +8,7 @@
  *  @author mrk
  */
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif
 
diff --git a/src/misc/pv/epicsException.h b/src/misc/pv/epicsException.h
index 3ff925a..e60709a 100644
--- a/src/misc/pv/epicsException.h
+++ b/src/misc/pv/epicsException.h
@@ -34,7 +34,8 @@
 #ifndef EPICSEXCEPTION_H_
 #define EPICSEXCEPTION_H_
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
+#define NOMINMAX
 #endif
 
 #include <stdexcept>
diff --git a/src/misc/pv/sharedVector.h b/src/misc/pv/sharedVector.h
index b092d91..b6eccb2 100644
--- a/src/misc/pv/sharedVector.h
+++ b/src/misc/pv/sharedVector.h
@@ -7,7 +7,7 @@
 #ifndef SHAREDVECTOR_H
 #define SHAREDVECTOR_H
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif
 
diff --git a/src/misc/timer.cpp b/src/misc/timer.cpp
index b10f22f..bdaafc1 100644
--- a/src/misc/timer.cpp
+++ b/src/misc/timer.cpp
@@ -8,7 +8,7 @@
  *  @author mrk
  */
  
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif
 
diff --git a/src/pv/pvData.h b/src/pv/pvData.h
index 94e30ee..d89c1fd 100644
--- a/src/pv/pvData.h
+++ b/src/pv/pvData.h
@@ -10,7 +10,7 @@
 #ifndef PVDATA_H
 #define PVDATA_H
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif
 
diff --git a/src/pv/pvType.h b/src/pv/pvType.h
index 48bcc43..28ad878 100644
--- a/src/pv/pvType.h
+++ b/src/pv/pvType.h
@@ -15,7 +15,7 @@
 #ifndef PVTYPE_H
 #define PVTYPE_H
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif