From 1b5b87a40e5f9b68a18456d94b5f5c16d2347b2e Mon Sep 17 00:00:00 2001 From: ocornut Date: Sat, 7 Mar 2020 15:19:51 +0100 Subject: [PATCH] Internals: Added #define NOMINMAX before windows.h include for single-compile-unit builds. --- imgui.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/imgui.cpp b/imgui.cpp index ad65e9f2..50c4a12f 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -1514,6 +1514,7 @@ ImU32 ImHashStr(const char* data_p, size_t data_size, ImU32 seed) #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif +#define NOMINMAX #ifndef __MINGW32__ #include #else @@ -9779,6 +9780,7 @@ static void WindowSettingsHandler_WriteAll(ImGuiContext* ctx, ImGuiSettingsHandl #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif +#define NOMINMAX #ifndef __MINGW32__ #include #else