From 161d2334e863b26fc893c6bbf8f8cb8b811ce586 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Thu, 26 May 2016 14:41:02 -0700 Subject: util/cbfstool: Include commonlib/helpers.h in common.h This avoids re-declaring common macros like ARRAY_SIZE, MIN, MAX and ALIGN. Also removes the issues around including both files in any tool. Also, fix comparison error in various files by replacing int with size_t. Change-Id: I06c763e5dd1bec97e8335499468bbdb016eb28e5 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/14978 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- util/cbfstool/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util/cbfstool/common.c') diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index bbb6141fe9..3093ba1465 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -139,7 +139,7 @@ static struct { uint32_t string_to_arch(const char *arch_string) { - int i; + size_t i; uint32_t ret = CBFS_ARCHITECTURE_UNKNOWN; for (i = 0; i < ARRAY_SIZE(arch_names); i++) { @@ -154,7 +154,7 @@ uint32_t string_to_arch(const char *arch_string) const char *arch_to_string(uint32_t a) { - int i; + size_t i; const char *ret = NULL; for (i = 0; i < ARRAY_SIZE(arch_names); i++) { -- cgit v1.2.3