From f8e00a084a123c9dbf811c76ea48786b62852c9f Mon Sep 17 00:00:00 2001 From: Giovanni Cerretani Date: Thu, 3 Sep 2020 18:45:47 +0200 Subject: [PATCH] NOMINMAX not handled properly (#1855) --- include/fmt/format-inl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h index f50c2da1..b35bbd62 100644 --- a/include/fmt/format-inl.h +++ b/include/fmt/format-inl.h @@ -23,14 +23,14 @@ #endif #ifdef _WIN32 -# if !defined(NOMINMAX) && !defined(WIN32_LEAN_AND_MEAN) +# ifdef FMT_BIG_WIN +# include +# else # define NOMINMAX # define WIN32_LEAN_AND_MEAN # include # undef WIN32_LEAN_AND_MEAN # undef NOMINMAX -# else -# include # endif # include #endif