| commit | cdbd6f4e91a6a3d01dbd1ef9576335e7946ac6d2 | [log] [tgz] |
|---|---|---|
| author | Adam Sawicki <adam.sawicki@amd.com> | Mon Jun 13 20:17:28 2022 +0200 |
| committer | GitHub <noreply@github.com> | Mon Jun 13 20:17:28 2022 +0200 |
| tree | 3314a754e0c0441da6e78b8ce59e21d12c87b846 | |
| parent | cfdc0f8775ab3258a3b9c4e47d8ce4b6f52a5441 [diff] | |
| parent | bbc3d1539011d409669c1a46c3854c70c5266590 [diff] |
Merge pull request #271 from Monika0000/master fix re-defines
diff --git a/src/VmaUsage.h b/src/VmaUsage.h index b3b0eef..5bff938 100644 --- a/src/VmaUsage.h +++ b/src/VmaUsage.h
@@ -25,8 +25,14 @@ #ifdef _WIN32 -#define NOMINMAX -#define WIN32_LEAN_AND_MEAN +#if !defined(NOMINMAX) + #define NOMINMAX +#endif + +#if !defined(WIN32_LEAN_AND_MEAN) + #define WIN32_LEAN_AND_MEAN +#endif + #include <Windows.h> #if !defined(VK_USE_PLATFORM_WIN32_KHR) #define VK_USE_PLATFORM_WIN32_KHR