Skip to content

Commit f95e85e

Browse files
Merge pull request #44 from hrydgard/nominmax-fix
Avoid redefinition warnings of NOMINMAX by checking if it's already been defined.
2 parents f305aeb + 14f7909 commit f95e85e

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

src/vk_mem_alloc.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,9 @@ available through VmaAllocatorCreateInfo::pRecordSettings.
13691369
#endif
13701370
#endif
13711371

1372+
#ifndef NOMINMAX
13721373
#define NOMINMAX // For Windows.h
1374+
#endif
13731375

13741376
#include <vulkan/vulkan.h>
13751377

0 commit comments

Comments
 (0)