projects
/
platform
/
upstream
/
assimp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a9284e5
)
[F] min/max redefined when including windows.h
author
smalcom
<smal.root@gmail.com>
Thu, 15 Sep 2016 19:25:34 +0000
(22:25 +0300)
committer
smalcom
<smal.root@gmail.com>
Thu, 15 Sep 2016 19:25:34 +0000
(22:25 +0300)
contrib/Open3DGC/o3dgcTimer.h
patch
|
blob
|
history
diff --git
a/contrib/Open3DGC/o3dgcTimer.h
b/contrib/Open3DGC/o3dgcTimer.h
index
303d4f7
..
97f5759
100644
(file)
--- a/
contrib/Open3DGC/o3dgcTimer.h
+++ b/
contrib/Open3DGC/o3dgcTimer.h
@@
-27,6
+27,8
@@
THE SOFTWARE.
#include "o3dgcCommon.h"
#ifdef WIN32
+/* Thank you, Microsoft, for file WinDef.h with min/max redefinition. */
+#define NOMINMAX
#include <windows.h>
#elif __MACH__
#include <mach/clock.h>