summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Richardson <wfrichar@chromium.org>2012-05-08 17:25:53 -0700
committerGerrit <chrome-bot@google.com>2012-05-09 10:46:38 -0700
commitec15b1fce9f34b247e629b849936e7afefd8cfe0 (patch)
tree702084b636f5266d0f38bb57765d365068652394
parent7153516212c59b209f6fe80caa10577dbc9666e4 (diff)
downloadvboot-ec15b1fce9f34b247e629b849936e7afefd8cfe0.tar.gz
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>
-rw-r--r--firmware/lib/include/vboot_common.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/firmware/lib/include/vboot_common.h b/firmware/lib/include/vboot_common.h
index 7032def4..76706bf6 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 {