luo980/miniz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Prevent min/max conflicts between windows.h and std namespace
This commit is contained in:
Martin Raiber 2023-09-28 20:00:07 +02:00 committed by GitHub
commit a23a38bf53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
miniz_zip.c
View File

@ -42,6 +42,12 @@ extern "C" {
#if defined(_MSC_VER) || defined(__MINGW64__) || defined(__MINGW32__) #if defined(_MSC_VER) || defined(__MINGW64__) || defined(__MINGW32__)
#define WIN32_LEAN_AND_MEAN #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> #include <windows.h>
static WCHAR* mz_utf8z_to_widechar(const char* str) static WCHAR* mz_utf8z_to_widechar(const char* str)