From ec15b1fce9f34b247e629b849936e7afefd8cfe0 Mon Sep 17 00:00:00 2001
From: Bill Richardson <wfrichar@chromium.org>
Date: Tue, 8 May 2012 17:25:53 -0700
Subject: [PATCH] Protect ARRAY_SIZE macro from being #defined twice

BUG=chrome-os-partner:7459
TEST=none

Change-Id: I3664ad9db4a4e0cecd38443bf01f99531ba80972
Reviewed-on: https://gerrit.chromium.org/gerrit/22183
Commit-Ready: Bill Richardson <wfrichar@chromium.org>
Tested-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
---
 firmware/lib/include/vboot_common.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/firmware/lib/include/vboot_common.h b/firmware/lib/include/vboot_common.h
index 7032def4cb..76706bf6fd 100644
--- a/firmware/lib/include/vboot_common.h
+++ b/firmware/lib/include/vboot_common.h
@@ -11,7 +11,9 @@
 #include "cryptolib.h"
 #include "vboot_struct.h"
 
+#ifndef ARRAY_SIZE
 #define ARRAY_SIZE(array) (sizeof(array)/sizeof(array[0]))
+#endif
 
 /* Error Codes for all common functions. */
 enum {