[coreboot-gerrit] Patch set updated for coreboot: util/cbfstool: Guard common macros with #ifndef

[Furquan Shaikh (furquan@google.com)]

Furquan Shaikh (furquan at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14978

-gerrit

commit 4cfcef82cc3783252e970fa9ec32edd9e38589dd
Author: Furquan Shaikh <furquan at google.com>
Date:   Thu May 26 14:41:02 2016 -0700

    util/cbfstool: Guard common macros with #ifndef
    
    Change-Id: I06c763e5dd1bec97e8335499468bbdb016eb28e5
    Signed-off-by: Furquan Shaikh <furquan at google.com>
---
 util/cbfstool/common.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h
index ea6f3cf..515dff2 100644
--- a/util/cbfstool/common.h
+++ b/util/cbfstool/common.h
@@ -28,10 +28,18 @@
 #include "swab.h"
 
 /* Helpers */
+#ifndef ARRAY_SIZE
 #define ARRAY_SIZE(a) (int)(sizeof(a) / sizeof((a)[0]))
+#endif
+#ifndef ALIGN
 #define ALIGN(val, by) (((val) + (by)-1)&~((by)-1))
+#endif
+#ifndef MAX
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
+#endif
+#ifndef MIN
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
+#endif
 
 #define IS_TOP_ALIGNED_ADDRESS(x)	((uint32_t)(x) > 0x80000000)