Merge pull request #1453 from david-bodor-at-craftunique/v1.x

only include windows.h when it's unavoidable

include/spdlog/common.h

@@ -15,18 +15,6 @@
 #include <type_traits>
 #include <functional>
 
-#ifdef _WIN32
-#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 //_WIN32
-
 #ifdef SPDLOG_COMPILED_LIB
 #undef SPDLOG_HEADER_ONLY
 #define SPDLOG_INLINE

include/spdlog/details/windows_include.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#ifndef NOMINMAX
+#define NOMINMAX // prevent windows redefining min/max
+#endif
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#include <windows.h>

include/spdlog/sinks/msvc_sink.h

@@ -8,6 +8,7 @@
 #include <spdlog/details/null_mutex.h>
 #include <spdlog/sinks/base_sink.h>
 
+#include <spdlog/details/windows_include.h>
 #include <winbase.h>
 
 #include <mutex>

include/spdlog/sinks/win_eventlog_sink.h

@@ -30,11 +30,12 @@ Windows Registry Editor Version 5.00
 
 #pragma once
 
-#include <winbase.h>
-
 #include <spdlog/details/null_mutex.h>
 #include <spdlog/sinks/base_sink.h>
 
+#include <spdlog/details/windows_include.h>
+#include <winbase.h>
+
 #include <mutex>
 #include <string>
 #include <vector>

include/spdlog/sinks/wincolor_sink.h

@@ -12,6 +12,8 @@
 #include <mutex>
 #include <string>
 #include <array>
+
+#include <spdlog/details/windows_include.h>
 #include <wincon.h>
 
 namespace spdlog {