util: add common ARRAY_SIZE define

I want to use this in more places, so put it in util.h rather than copying & pasting it into another file. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
dgibson · May 24, 2013 · 4ad49c3 · 4ad49c3
1 parent b9e8065
commit 4ad49c3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/convert-dtsv0-lexer.l b/convert-dtsv0-lexer.l
@@ -50,8 +50,6 @@ static int saw_hyphen; /* = 0 */
 static unsigned long long last_val;
 static char *last_name; /* = NULL */
 
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-
 const struct {
 	const char *pattern;
 	int obase, width;

diff --git a/dtc.h b/dtc.h
@@ -66,7 +66,6 @@ typedef uint32_t cell_t;
 #define strneq(a, b, n)	(strncmp((a), (b), (n)) == 0)
 
 #define ALIGN(x, a)	(((x) + (a) - 1) & ~((a) - 1))
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
 /* Data blobs */
 enum markertype {

diff --git a/util.h b/util.h
@@ -24,6 +24,8 @@
  *                                                                   USA
  */
 
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
 static inline void __attribute__((noreturn)) die(const char *str, ...)
 {
 	va_list ap;
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,8 @@ @@
      *                                                                   USA
      */
+    #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
     static inline void __attribute__((noreturn)) die(const char *str, ...)
     {
     	va_list ap;
@@ Expand Down @@