mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 04:20:29 +00:00
Code Issues Projects Releases Wiki Activity

fix accidental header namespace inclusion

Browse Source
This commit is contained in:
Stanislaw Halik 2018-12-12 00:12:13 +01:00
parent f6c8842457
commit c5c160870d
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/debug/debugging.cpp
View File

@ -2,6 +2,12 @@
#include <components/crashcatcher/crashcatcher.hpp> #include <components/crashcatcher/crashcatcher.hpp>
#ifdef _WIN32
# undef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#endif
namespace Debug namespace Debug
{ {
#ifdef _WIN32 #ifdef _WIN32

12
components/debug/debugging.hpp
View File

@ -10,6 +10,12 @@
#include "debuglog.hpp" #include "debuglog.hpp"
#if defined _WIN32 && defined _DEBUG
# undef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
#endif
namespace Debug namespace Debug
{ {
// ANSI colors for terminal // ANSI colors for terminal
@ -47,11 +53,7 @@ namespace Debug
bool attachParentConsole(); bool attachParentConsole();
#endif #endif
#if defined(_WIN32) && defined(_DEBUG) #if defined _WIN32 && defined _DEBUG
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN 1
#endif // !WIN32_LEAN_AND_MEAN
#include <Windows.h>
class DebugOutput : public DebugOutputBase class DebugOutput : public DebugOutputBase
{ {
public: public: