summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary
diff options
context:
space:
mode:
authorAlexander von Gluck IV <[email protected]>2014-12-09 21:05:03 +0000
committerAlexander von Gluck IV <[email protected]>2014-12-10 14:01:00 +0000
commit63d3f621e3291cbc3be92dff9fb901ddcf0a9f0f (patch)
tree748b1896f2569dd3de878e925b8b02a95d4c1a70 /src/gallium/auxiliary
parent3a18fc60581ad27811b0b4b22fce51da0ae8a008 (diff)
gallium/aux: Avoid redefining MAX
* Can be redefined on some platforms through u_debug.h
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r--src/gallium/auxiliary/cso_cache/cso_hash.c2
1 files changed, 2 insertions, 0 deletions
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;