From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 7 Dec 2012 11:37:16 +0000 (+0000)
Subject: directxtex: Don't redefine NOMINMAX.
X-Git-Url: https://git.cworth.org/git?p=apitrace;a=commitdiff_plain;h=2157e63ae3d1b8378c224ed18555295a94d488d9

directxtex: Don't redefine NOMINMAX.
---

diff --git a/thirdparty/directxtex/DirectXTex/DirectXTexP.h b/thirdparty/directxtex/DirectXTex/DirectXTexP.h
index b530254..88c9d55 100644
--- 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