diff options
| author | Alexander von Gluck IV <kallisti5@unixzen.com> | 2014-12-09 21:05:03 +0000 |
|---|---|---|
| committer | Alexander von Gluck IV <kallisti5@unixzen.com> | 2014-12-10 14:01:00 +0000 |
| commit | 63d3f621e3291cbc3be92dff9fb901ddcf0a9f0f (patch) | |
| tree | 748b1896f2569dd3de878e925b8b02a95d4c1a70 /src/gallium/auxiliary/cso_cache | |
| parent | 3a18fc60581ad27811b0b4b22fce51da0ae8a008 (diff) | |
| download | external_mesa3d-63d3f621e3291cbc3be92dff9fb901ddcf0a9f0f.zip external_mesa3d-63d3f621e3291cbc3be92dff9fb901ddcf0a9f0f.tar.gz external_mesa3d-63d3f621e3291cbc3be92dff9fb901ddcf0a9f0f.tar.bz2 | |
gallium/aux: Avoid redefining MAX
* Can be redefined on some platforms through u_debug.h
Diffstat (limited to 'src/gallium/auxiliary/cso_cache')
| -rw-r--r-- | src/gallium/auxiliary/cso_cache/cso_hash.c | 2 |
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 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; |