From 3d48e2bd257f8f63292d9622da5b1dd75d1a865e Mon Sep 17 00:00:00 2001 From: Pranav Srinivas Kumar Date: Tue, 15 Sep 2020 08:54:21 -0500 Subject: [PATCH] Closes #72 --- include/indicators/termcolor.hpp | 4 ++++ single_include/indicators/indicators.hpp | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/indicators/termcolor.hpp b/include/indicators/termcolor.hpp index b660559..09555be 100644 --- a/include/indicators/termcolor.hpp +++ b/include/indicators/termcolor.hpp @@ -34,6 +34,10 @@ #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX) # include #elif defined(TERMCOLOR_OS_WINDOWS) +#if defined(_MSC_VER) +#if !defined(NOMINMAX) +#define NOMINMAX +#endif # include # include #endif diff --git a/single_include/indicators/indicators.hpp b/single_include/indicators/indicators.hpp index be18c1b..8a42110 100644 --- a/single_include/indicators/indicators.hpp +++ b/single_include/indicators/indicators.hpp @@ -51,6 +51,10 @@ enum class ProgressType { incremental, decremental }; #if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX) # include #elif defined(TERMCOLOR_OS_WINDOWS) +#if defined(_MSC_VER) +#if !defined(NOMINMAX) +#define NOMINMAX +#endif # include # include #endif @@ -656,7 +660,7 @@ namespace termcolor #include -#if defined(_MSC_VER) +#if defined(_WIN32) #include namespace indicators {