From 3e416abd5c937df0b12c5ddc659203646be29d21 Mon Sep 17 00:00:00 2001 From: anders_k Date: Sat, 28 Nov 2015 21:33:12 +0000 Subject: [PATCH] Don't look for a specific 2003 TK version when deciding which std::min/max workaround to apply git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6646 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/Platform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Platform.h b/Source/Platform.h index de19f866..aea5a208 100644 --- a/Source/Platform.h +++ b/Source/Platform.h @@ -130,7 +130,7 @@ typedef DWORDLONG ULONGLONG,*PULONGLONG; #ifdef __cplusplus #include -#if defined(_MSC_VER) && ( _MSC_VER <= 1200 || (defined(_MIN)&&_MSC_FULL_VER<=140040310) ) && _MSC_FULL_VER!=13103052 +#if defined(_MSC_VER) && ( _MSC_VER <= 1200 || (defined(_MIN) && _MSC_FULL_VER >= 140000000 && _MSC_FULL_VER <= 140040310) ) #define STD_MIN std::_MIN #define STD_MAX std::_MAX #else