NOMINMAX not handled properly (#1855)

f8e00a08 · Giovanni Cerretani · GitHub · 6cccdc24 · f8e00a08
Unverified Commit f8e00a08 authored Sep 03, 2020 by Giovanni Cerretani Committed by GitHub Sep 03, 2020
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

include/fmt/format-inl.h include/fmt/format-inl.h +3 -3

No files found.
--- 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 <windows.h>
+#  else
 #    define NOMINMAX
 #    define WIN32_LEAN_AND_MEAN
 #    include <windows.h>
 #    undef WIN32_LEAN_AND_MEAN
 #    undef NOMINMAX
-#  else
-#    include <windows.h>
 #  endif
 #  include <io.h>
 #endif