From 1e425dda0387df34a5b4ad7be02a2235e8ffa71d Mon Sep 17 00:00:00 2001 From: Adam Sawicki Date: Mon, 10 Sep 2018 16:52:13 +0200 Subject: [PATCH] Added #ifdef NOMINMAX. Thanks Krzysztof Kondrak ! --- src/vk_mem_alloc.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h index 0335da6..179e9df 100644 --- a/src/vk_mem_alloc.h +++ b/src/vk_mem_alloc.h @@ -1369,7 +1369,9 @@ available through VmaAllocatorCreateInfo::pRecordSettings. #endif #endif -#define NOMINMAX // For windows.h +#ifndef NOMINMAX + #define NOMINMAX // For windows.h +#endif #include