From 355e418e01baf1f4fadc3e7ff95f9da8dd604543 Mon Sep 17 00:00:00 2001 From: gabime Date: Mon, 15 Jun 2020 15:25:29 +0300 Subject: [PATCH] Added WIN32_LEAN_AND_MEAN define before including windows.h --- include/fmt/format-inl.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h index d0080907..e63cec8e 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