Merge pull request #872 from Fishybeing/fix/guard-nominmax

build(windows): guard NOMINMAX before including windows.h
2026-10-07 15:24:47 +13:00 · 2026-10-07 15:24:47 +13:00 · fc5341aca2
parent 0e58c7034f 5a04d3cc9e
commit fc5341aca2
4 changed files with 8 additions and 0 deletions
--- a/core/libs/prx/libc/src/Filesystem.cpp
+++ b/core/libs/prx/libc/src/Filesystem.cpp
@ -2,7 +2,9 @@
 #include <cerrno>
 #include <vector>
 #ifdef _WIN32
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #else
 #include <unistd.h>
--- a/core/libs/prx/libkernel/DirectMemory/Export.cpp
+++ b/core/libs/prx/libkernel/DirectMemory/Export.cpp
@ -8,7 +8,9 @@
 #include "prx/libkernel/Pthread/include/Pthread.hpp"
 #ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #else
 #include <cerrno>
--- a/core/libs/prx/libkernel/Module/src/DynamicLoader.cpp
+++ b/core/libs/prx/libkernel/Module/src/DynamicLoader.cpp
@ -9,7 +9,9 @@
 #include <string>
 #include <vector>
 #ifdef _WIN32
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #else
 #include <dlfcn.h>
--- a/core/libs/tests/GuestAccess.cpp
+++ b/core/libs/tests/GuestAccess.cpp
@ -3,7 +3,9 @@
 #include <cstdlib>
 #include <fstream>
 #ifdef _WIN32
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #include <aclapi.h>
 #endif