From: Eric Anholt <eric@anholt.net>
Date: Tue, 24 Feb 2015 13:47:58 +0000 (+0000)
Subject: r600: Fix build after 984f3069370cd4a347cb38269d430b428385affd
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1d1e820a6dce5e6fc8f67bd0f00e402645774e1b;p=mesa.git

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.
---

diff --git a/src/gallium/drivers/r600/sb/sb_bc.h b/src/gallium/drivers/r600/sb/sb_bc.h
index 6d3dc4da2f6..072d8f8b4e0 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