]> git.cworth.org Git - apitrace/commitdiff
projects / apitrace / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 400cd65)
directxtex: Don't redefine NOMINMAX.
authorJosé Fonseca <jfonseca@vmware.com>
Fri, 7 Dec 2012 11:37:16 +0000 (11:37 +0000)
committerJosé Fonseca <jfonseca@vmware.com>
Fri, 7 Dec 2012 11:38:55 +0000 (11:38 +0000)
thirdparty/directxtex/DirectXTex/DirectXTexP.h patch | blob | history

diff --git a/thirdparty/directxtex/DirectXTex/DirectXTexP.h b/thirdparty/directxtex/DirectXTex/DirectXTexP.h
index b5302546dc57849909e0bf4ae7e03cf577f3a6ce..88c9d55f28c18e3ad381184681721b45edfd69d8 100644 (file)
--- a/thirdparty/directxtex/DirectXTex/DirectXTexP.h
+++ b/thirdparty/directxtex/DirectXTex/DirectXTexP.h
@@ -17,7 +17,9 @@
 #pragma once
 #endif
 
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 
 #ifdef USE_XNAMATH
Carl's hacks to apitrace (upstream at https://github.com/apitrace/apitrace)