Mesa (master): r600: Fix build after 984f3069370cd4a347cb38269d430b428385affd

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 1d1e820a6dce5e6fc8f67bd0f00e402645774e1b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d1e820a6dce5e6fc8f67bd0f00e402645774e1b

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Feb 24 13:47:58 2015 +0000

r600: Fix build after 984f3069370cd4a347cb38269d430b428385affd

Same as for the CLAMP macro, undef it before including a header file that
tries to make fields with that name.

---

 src/gallium/drivers/r600/sb/sb_bc.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/r600/sb/sb_bc.h b/src/gallium/drivers/r600/sb/sb_bc.h
index 6d3dc4d..072d8f8 100644
--- a/src/gallium/drivers/r600/sb/sb_bc.h
+++ b/src/gallium/drivers/r600/sb/sb_bc.h
@@ -784,7 +784,7 @@ public: \
 
 // CLAMP macro defined elsewhere interferes with bytecode field name
 #undef CLAMP
-
+#undef ARRAY_SIZE
 #include "sb_bc_fmt_def.inc"
 
 #undef BC_FORMAT_BEGIN