projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3a18fc6)
gallium/aux: Avoid redefining MAX
authorAlexander von Gluck IV <kallisti5@unixzen.com>
Tue, 9 Dec 2014 21:05:03 +0000 (21:05 +0000)
committerAlexander von Gluck IV <kallisti5@unixzen.com>
Wed, 10 Dec 2014 14:01:00 +0000 (14:01 +0000)
* Can be redefined on some platforms through u_debug.h

src/gallium/auxiliary/cso_cache/cso_hash.c patch | blob | history

diff --git a/src/gallium/auxiliary/cso_cache/cso_hash.c b/src/gallium/auxiliary/cso_cache/cso_hash.c
index e04d8ed04e7337f47840e13fd130fadd2ca1f8af..2a3f3611e650d15d862a0561b689c6a88812de57 100644 (file)
--- 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;