Merge pull request #1 from nyq/nyq-fix-min-max-conflicts
Prevent min/max conflicts between windows.h and std namespace
This commit is contained in:
commit
5891bf568d
@ -45,6 +45,9 @@ extern "C" {
|
||||
#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)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user