projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 98ae01c)
r600: Fix build after 984f3069370cd4a347cb38269d430b428385affd
authorEric Anholt <eric@anholt.net>
Tue, 24 Feb 2015 13:47:58 +0000 (13:47 +0000)
committerEric Anholt <eric@anholt.net>
Tue, 24 Feb 2015 13:49:12 +0000 (13:49 +0000)
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 patch | blob | history

diff --git a/src/gallium/drivers/r600/sb/sb_bc.h b/src/gallium/drivers/r600/sb/sb_bc.h
index 6d3dc4da2f6373fd3d27ce2f3723f5683ee1ce1e..072d8f8b4e08c35b08bbcc95088d4a823d765209 100644 (file)
--- 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