projects
/
platform
/
upstream
/
Vulkan-Tools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ffe404f
)
vulkaninfo: Check if NOMINMAX is already defined
author
Biswapriyo Nath
<nathbappai@gmail.com>
Mon, 24 Aug 2020 20:19:05 +0000
(
01:49
+0530)
committer
jeremyk-lunarg
<jeremyk@lunarg.com>
Wed, 26 Aug 2020 22:35:43 +0000
(16:35 -0600)
vulkaninfo/vulkaninfo.h
patch
|
blob
|
history
diff --git
a/vulkaninfo/vulkaninfo.h
b/vulkaninfo/vulkaninfo.h
index
43446c1
..
21a83cb
100644
(file)
--- a/
vulkaninfo/vulkaninfo.h
+++ b/
vulkaninfo/vulkaninfo.h
@@
-57,7
+57,9
@@
#if defined(_WIN32)
#include <fcntl.h>
#include <io.h>
+#ifndef NOMINMAX
#define NOMINMAX
+#endif
#include <windows.h>
#if _MSC_VER == 1900
#pragma warning(disable : 4800)