Module: Mesa Branch: master Commit: 63d3f621e3291cbc3be92dff9fb901ddcf0a9f0f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=63d3f621e3291cbc3be92dff9fb901ddcf0a9f0f
Author: Alexander von Gluck IV <[email protected]> Date: Tue Dec 9 21:05:03 2014 +0000 gallium/aux: Avoid redefining MAX * 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; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
