Change console_globals include to windows.h only

29901260 · Daniel Chabrowski · 3edc7f1d · 29901260
Commit 29901260 authored Aug 22, 2018 by Daniel Chabrowski
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

include/spdlog/details/console_globals.h include/spdlog/details/console_globals.h +10 -1

No files found.
--- a/include/spdlog/details/console_globals.h
+++ b/include/spdlog/details/console_globals.h
@@ -9,7 +9,16 @@
 #include <mutex>

 #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 <windows.h>
 #endif

 namespace spdlog {