From 5a04d3cc9eaff1d81dd79e7ff4f0ddcfd84e211b Mon Sep 17 00:00:00 2001 From: Fishybeing <328519762+Fishybeing@users.noreply.github.com> Date: Tue, 6 Oct 2026 13:45:13 +0200 Subject: [PATCH] build(windows): guard NOMINMAX before including windows.h Four sources defined NOMINMAX unconditionally, which redefines the macro the build already passes and warns on every MinGW build. Use the #ifndef guard the rest of the tree uses. --- core/libs/prx/libc/src/Filesystem.cpp | 2 ++ core/libs/prx/libkernel/DirectMemory/Export.cpp | 2 ++ core/libs/prx/libkernel/Module/src/DynamicLoader.cpp | 2 ++ core/libs/tests/GuestAccess.cpp | 2 ++ 4 files changed, 8 insertions(+) diff --git a/core/libs/prx/libc/src/Filesystem.cpp b/core/libs/prx/libc/src/Filesystem.cpp index 258f10c3f..d7f191170 100644 --- a/core/libs/prx/libc/src/Filesystem.cpp +++ b/core/libs/prx/libc/src/Filesystem.cpp @@ -2,7 +2,9 @@ #include #include #ifdef _WIN32 +#ifndef NOMINMAX #define NOMINMAX +#endif #include #else #include diff --git a/core/libs/prx/libkernel/DirectMemory/Export.cpp b/core/libs/prx/libkernel/DirectMemory/Export.cpp index 096519100..1cf4a14f0 100644 --- a/core/libs/prx/libkernel/DirectMemory/Export.cpp +++ b/core/libs/prx/libkernel/DirectMemory/Export.cpp @@ -7,7 +7,9 @@ #include "prx/libkernel/DirectMemory/DirectMemory.hpp" #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN +#ifndef NOMINMAX #define NOMINMAX +#endif #include #else #include diff --git a/core/libs/prx/libkernel/Module/src/DynamicLoader.cpp b/core/libs/prx/libkernel/Module/src/DynamicLoader.cpp index 24a842615..d2604c94d 100644 --- a/core/libs/prx/libkernel/Module/src/DynamicLoader.cpp +++ b/core/libs/prx/libkernel/Module/src/DynamicLoader.cpp @@ -9,7 +9,9 @@ #include #include #ifdef _WIN32 +#ifndef NOMINMAX #define NOMINMAX +#endif #include #else #include diff --git a/core/libs/tests/GuestAccess.cpp b/core/libs/tests/GuestAccess.cpp index 723b9c090..0cce786ad 100644 --- a/core/libs/tests/GuestAccess.cpp +++ b/core/libs/tests/GuestAccess.cpp @@ -3,7 +3,9 @@ #include #include #ifdef _WIN32 +#ifndef NOMINMAX #define NOMINMAX +#endif #include #include #endif