diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h index ea4821c2..f9685399 100644 --- a/include/fmt/format-inl.h +++ b/include/fmt/format-inl.h @@ -23,12 +23,14 @@ #endif #ifdef _WIN32 -# if defined(NOMINMAX) -# include -# else +# if !defined(NOMINMAX) && !defined(WIN32_LEAN_AND_MEAN) # define NOMINMAX +# define WIN32_LEAN_AND_MEAN # include +# undef WIN32_LEAN_AND_MEAN # undef NOMINMAX +# else +# include # endif # include #endif