[PATCH 09/10] util: add common ARRAY_SIZE define
Mike Frysinger
vapier at gentoo.org
Tue Apr 16 12:13:16 EST 2013
I want to use this in more places, so put it in util.h rather than
copying & pasting it into another file.
Acked-by: David Gibson <david at gibson.dropbear.id.au>
Signed-off-by: Mike Frysinger <vapier at gentoo.org>
---
convert-dtsv0-lexer.l | 2 --
dtc.h | 1 -
util.h | 2 ++
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/convert-dtsv0-lexer.l b/convert-dtsv0-lexer.l
index 8902648..548e719 100644
--- 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
index 3e42a07..264a20c 100644
--- 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
index 7b9a840..8f40b44 100644
--- 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;
--
1.8.1.2
More information about the devicetree-discuss
mailing list