Mesa (master): vc4: Reuse the util header instead of defining our own ARRAY_SIZE.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Mon Sep 15 12:04:32 2014 -0700

vc4: Reuse the util header instead of defining our own ARRAY_SIZE.

Fixes redefinition warnings if you end up including this header before
util stuff.

---

 src/gallium/drivers/vc4/vc4_qpu_defines.h |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_qpu_defines.h b/src/gallium/drivers/vc4/vc4_qpu_defines.h
index f7ad01c..0715df2 100644
--- a/src/gallium/drivers/vc4/vc4_qpu_defines.h
+++ b/src/gallium/drivers/vc4/vc4_qpu_defines.h
@@ -25,8 +25,7 @@
 #define VC4_QPU_DEFINES_H
 
 #include <assert.h>
-
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+#include <util/macros.h>
 
 enum qpu_op_add {
         QPU_A_NOP,