[Mesa-dev] [PATCH] gallium/aux: Avoid redefining MAX

Alexander von Gluck IV kallisti5 at unixzen.com
Tue Dec 9 13:05:03 PST 2014


* Can be redefined on some platforms through u_debug.h
---
 src/gallium/auxiliary/cso_cache/cso_hash.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/auxiliary/cso_cache/cso_hash.c b/src/gallium/auxiliary/cso_cache/cso_hash.c
index e04d8ed..2a3f361 100644
--- a/src/gallium/auxiliary/cso_cache/cso_hash.c
+++ b/src/gallium/auxiliary/cso_cache/cso_hash.c
@@ -35,7 +35,9 @@
 
 #include "cso_hash.h"
 
+#ifndef MAX
 #define MAX(a, b) ((a > b) ? (a) : (b))
+#endif
 
 static const int MinNumBits = 4;
 
-- 
1.8.3.4



More information about the mesa-dev mailing list