Merge pull request #283 from nyq/nyq-fix-min-max-conflicts

Prevent min/max conflicts between windows.h and std namespace
richgel999 · Sep 28, 2023 · a23a38b · a23a38b
2 parents 9ae305f + 90a5b2f
commit a23a38b
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/miniz_zip.c b/miniz_zip.c
@@ -42,6 +42,12 @@ extern "C" {
 #if defined(_MSC_VER) || defined(__MINGW64__) || defined(__MINGW32__)
 
 #define WIN32_LEAN_AND_MEAN
+#ifndef __cplusplus
+  #define MICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS 0
+#endif
+#ifndef NOMINMAX
+  #define NOMINMAX
+#endif
 #include <windows.h>
 
 static WCHAR* mz_utf8z_to_widechar(const char* str)