fix accidental header namespace inclusion

6 years ago · c5c160870d
parent f6c8842457
commit c5c160870d
2 changed files with 13 additions and 5 deletions
--- a/components/debug/debugging.cpp
+++ b/components/debug/debugging.cpp
@ -2,6 +2,12 @@

 #include <components/crashcatcher/crashcatcher.hpp>

+#ifdef _WIN32
+#   undef WIN32_LEAN_AND_MEAN
+#   define WIN32_LEAN_AND_MEAN
+#   include <windows.h>
+#endif
+
 namespace Debug
 {
 #ifdef _WIN32
--- a/components/debug/debugging.hpp
+++ b/components/debug/debugging.hpp
@ -10,6 +10,12 @@

 #include "debuglog.hpp"

+#if defined _WIN32 && defined _DEBUG
+#   undef WIN32_LEAN_AND_MEAN
+#   define WIN32_LEAN_AND_MEAN
+#   include <windows.h>
+#endif
+
 namespace Debug
 {
    // ANSI colors for terminal
@ -47,11 +53,7 @@ namespace Debug
    bool attachParentConsole();
 #endif

-#if defined(_WIN32) && defined(_DEBUG)
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN 1
-#endif // !WIN32_LEAN_AND_MEAN
-#include <Windows.h>
+#if defined _WIN32 && defined _DEBUG
    class DebugOutput : public DebugOutputBase
    {
    public: