Fix build on Windows

Use wrapper header over Windows.h to undefine far and near in a single place.

apps/opencs/editor.cpp

@@ -15,7 +15,7 @@
 #include "model/world/data.hpp"
 
 #ifdef _WIN32
-#include <Windows.h>
+#include <components/windows.hpp>
 #endif
 
 using namespace Fallback;

apps/openmw/main.cpp

@@ -9,10 +9,7 @@
 #include "options.hpp"
 
 #if defined(_WIN32)
-#ifndef WIN32_LEAN_AND_MEAN
+#include <components/windows.hpp>
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
 // makes __argc and __argv available on windows
 #include <cstdlib>
 #endif

components/crashcatcher/windows_crashcatcher.hpp

@@ -3,10 +3,7 @@
 
 #include <string>
 
-#undef WIN32_LEAN_AND_MEAN
+#include <components/windows.hpp>
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-
 #include <components/crashcatcher/crashcatcher.hpp>
 
 namespace Crash

components/crashcatcher/windows_crashmonitor.cpp

@@ -1,8 +1,6 @@
 #include "windows_crashmonitor.hpp"
 
-#undef WIN32_LEAN_AND_MEAN
+#include <components/windows.hpp>
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
 #include <Psapi.h>
 
 #include <DbgHelp.h>

components/crashcatcher/windows_crashmonitor.hpp

@@ -1,9 +1,7 @@
 #ifndef WINDOWS_CRASHMONITOR_HPP
 #define WINDOWS_CRASHMONITOR_HPP
 
-#undef WIN32_LEAN_AND_MEAN
+#include <components/windows.hpp>
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
 
 #include <atomic>
 #include <unordered_map>

components/crashcatcher/windows_crashshm.hpp

@@ -1,9 +1,7 @@
 #ifndef WINDOWS_CRASHSHM_HPP
 #define WINDOWS_CRASHSHM_HPP
 
-#undef WIN32_LEAN_AND_MEAN
+#include <components/windows.hpp>
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
 
 namespace Crash
 {

components/debug/debugging.cpp

@@ -7,10 +7,8 @@
 #include <components/crashcatcher/crashcatcher.hpp>
 
 #ifdef _WIN32
-#   include <components/crashcatcher/windows_crashcatcher.hpp>
+#include <components/crashcatcher/windows_crashcatcher.hpp>
-#   undef WIN32_LEAN_AND_MEAN
+#include <components/windows.hpp>
-#   define WIN32_LEAN_AND_MEAN
-#   include <windows.h>
 #endif
 
 namespace Debug

components/debug/debugging.hpp

@@ -12,9 +12,7 @@
 #include "debuglog.hpp"
 
 #if defined _WIN32 && defined _DEBUG
-#   undef WIN32_LEAN_AND_MEAN
+#include <components/windows.hpp>
-#   define WIN32_LEAN_AND_MEAN
-#   include <windows.h>
 #endif
 
 namespace Debug

components/files/lowlevelfile.hpp

@@ -19,7 +19,7 @@
 #include <cstdio>
 #elif FILE_API == FILE_API_POSIX
 #elif FILE_API == FILE_API_WIN32
-#include <windows.h>
+#include <components/windows.hpp>
 #else
 #error Unsupported File API
 #endif

components/misc/thread.cpp

@@ -25,10 +25,7 @@ namespace Misc
 
 #elif defined(WIN32)
 
-#undef WIN32_LEAN_AND_MEAN
+#include <components/windows.hpp>
-#define WIN32_LEAN_AND_MEAN
-
-#include <windows.h>
 
 namespace Misc
 {

components/windows.hpp

@@ -0,0 +1,9 @@
+#ifndef OPENMW_COMPONENTS_WINDOWS_H
+#define OPENMW_COMPONENTS_WINDOWS_H
+
+#include <Windows.h>
+
+#undef far
+#undef near
+
+#endif