From: Eric Anholt <eric@anholt.net>
Date: Mon, 15 Sep 2014 19:04:32 +0000 (-0700)
Subject: vc4: Reuse the util header instead of defining our own ARRAY_SIZE.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=50292d76c5aa59be06468e3c2855dd7c1d837ecb;p=mesa.git

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

diff --git a/src/gallium/drivers/vc4/vc4_qpu_defines.h b/src/gallium/drivers/vc4/vc4_qpu_defines.h
index f7ad01c6163..0715df25b2d 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,