From 2ee8769752a50a2046f4a3f5a1c179be067ddb03 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Wed, 6 Apr 2016 15:29:30 -0500
Subject: [PATCH] Prevent redefinition of NOMINMAX

While this protection is not strictly necessary here, if someone
does a cut-and-paste into a header file it should be included.
---
 testApp/misc/testBitSet.cpp        | 2 +-
 testApp/misc/testSerialization.cpp | 2 +-
 testApp/misc/testTypeCast.cpp      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/testApp/misc/testBitSet.cpp b/testApp/misc/testBitSet.cpp
index 0a342fe..67b4036 100644
--- a/testApp/misc/testBitSet.cpp
+++ b/testApp/misc/testBitSet.cpp
@@ -6,7 +6,7 @@
  */
 /* Author:  Matej Sekoranja Date: 2010.10.18 */
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif
 
diff --git a/testApp/misc/testSerialization.cpp b/testApp/misc/testSerialization.cpp
index 797a26f..8f96619 100644
--- a/testApp/misc/testSerialization.cpp
+++ b/testApp/misc/testSerialization.cpp
@@ -10,7 +10,7 @@
  *      Author: Miha Vitorovic
  */
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif
 
diff --git a/testApp/misc/testTypeCast.cpp b/testApp/misc/testTypeCast.cpp
index cab5fb7..5c5014c 100644
--- a/testApp/misc/testTypeCast.cpp
+++ b/testApp/misc/testTypeCast.cpp
@@ -5,7 +5,7 @@
  */
 /* Author:  Michael Davidsaver */
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif