From 5332c06fd0ffdf2f0e49ca21f7c5ec0893e5cdf9 Mon Sep 17 00:00:00 2001 From: Giovanni Cerretani Date: Thu, 3 Sep 2020 16:42:46 +0200 Subject: [PATCH] FMT_BIG_WIN to get all windows.h content See https://github.com/fmtlib/fmt/pull/1855 for details --- include/fmt/format-inl.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h index 33dd46c9..b35bbd62 100644 --- a/include/fmt/format-inl.h +++ b/include/fmt/format-inl.h @@ -23,18 +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 -# elif defined(NOMINMAX) && !defined(WIN32_LEAN_AND_MEAN) -# define WIN32_LEAN_AND_MEAN -# include -# undef WIN32_LEAN_AND_MEAN -# else -# include # endif # include #endif