From f4a960abdcf1e1376b3bbc78f28f31fca448e103 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Tue, 30 Dec 2014 17:05:12 -0500 Subject: [PATCH] Undefine min and max macros. Thanks for nothing MS Signed-off-by: Ian Bell --- src/CoolProp.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/CoolProp.cpp b/src/CoolProp.cpp index f133f1b7..8cef455c 100644 --- a/src/CoolProp.cpp +++ b/src/CoolProp.cpp @@ -5,10 +5,17 @@ #define _CRTDBG_MAP_ALLOC #define _CRT_SECURE_NO_WARNINGS #include + #endif #if defined(__ISWINDOWS__) #include +#ifdef min +#undef min +#endif +#ifdef max +#undef max +#endif #else #ifndef DBL_EPSILON #include