From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Tue, 9 Dec 2014 21:05:03 +0000 (+0000)
Subject: gallium/aux: Avoid redefining MAX
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=63d3f621e3291cbc3be92dff9fb901ddcf0a9f0f;p=mesa.git

gallium/aux: Avoid redefining MAX

* Can be redefined on some platforms through u_debug.h
---

diff --git a/src/gallium/auxiliary/cso_cache/cso_hash.c b/src/gallium/auxiliary/cso_cache/cso_hash.c
index e04d8ed04e7..2a3f3611e65 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;