From 3edc7f1d182b1f7d77d50df4e60aafb6143a1bfc Mon Sep 17 00:00:00 2001 From: Daniel Chabrowski Date: Wed, 22 Aug 2018 21:46:46 +0200 Subject: [PATCH 1/2] Add missing include in console_globals.h --- include/spdlog/details/console_globals.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/spdlog/details/console_globals.h b/include/spdlog/details/console_globals.h index 4ac7f743..128003ea 100644 --- a/include/spdlog/details/console_globals.h +++ b/include/spdlog/details/console_globals.h @@ -8,6 +8,10 @@ #include #include +#ifdef _WIN32 +#include "spdlog/details/os.h" +#endif + namespace spdlog { namespace details { struct console_stdout From 299012605485077b1f92415d34ac11db92c5b8f7 Mon Sep 17 00:00:00 2001 From: Daniel Chabrowski Date: Wed, 22 Aug 2018 22:47:16 +0200 Subject: [PATCH 2/2] Change console_globals include to windows.h only --- include/spdlog/details/console_globals.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/include/spdlog/details/console_globals.h b/include/spdlog/details/console_globals.h index 128003ea..e2afb6bf 100644 --- a/include/spdlog/details/console_globals.h +++ b/include/spdlog/details/console_globals.h @@ -9,7 +9,16 @@ #include #ifdef _WIN32 -#include "spdlog/details/os.h" + +#ifndef NOMINMAX +#define NOMINMAX // prevent windows redefining min/max +#endif + +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif + +#include #endif namespace spdlog {