From 6d6f79b1a45348a8b3d4120a9241a2ab9113e4ac Mon Sep 17 00:00:00 2001
From: Jason Turner <jason@emptycrate.com>
Date: Mon, 18 Apr 2016 14:38:25 -0600
Subject: [PATCH] Only pop min/max if they were defined previously

---
 include/chaiscript/language/chaiscript_parser.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/chaiscript/language/chaiscript_parser.hpp b/include/chaiscript/language/chaiscript_parser.hpp
index 715d90cf..1ea73716 100644
--- a/include/chaiscript/language/chaiscript_parser.hpp
+++ b/include/chaiscript/language/chaiscript_parser.hpp
@@ -23,6 +23,7 @@
 
 
 #if defined(CHAISCRIPT_MSVC) && defined(max) && defined(min)
+#define CHAISCRIPT_PUSHED_MIN_MAX
 #pragma push_macro("max") // Why Microsoft? why? This is worse than bad
 #undef max
 #pragma push_macro("min")
@@ -2454,7 +2455,8 @@ namespace chaiscript
 }
 
 
-#ifdef CHAISCRIPT_MSVC
+#if defined(CHAISCRIPT_MSVC) && defined(CHAISCRIPT_PUSHED_MIN_MAX)
+#undef CHAISCRIPT_PUSHED_MIN_MAX
 #pragma pop_macro("min")
 #pragma pop_macro("max")
 #endif