summaryrefslogtreecommitdiff
path: root/util/flashrom/flashrom.c
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2009-04-24 16:17:41 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2009-04-24 16:17:41 +0000
commita5de85cb861e1aa4ea429aa5d0fa1dd21e30a611 (patch)
tree371c682867a2e606ecf75d3c75a7bdb88040df59 /util/flashrom/flashrom.c
parent2895c45486e4f6c99013bf319ff7277e51aad32d (diff)
MAX may already be defined. Also, fix smaller cosmetics (trivial).
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Uwe Hermann <uwe@hermann-uwe.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4205 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util/flashrom/flashrom.c')
-rw-r--r--util/flashrom/flashrom.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/util/flashrom/flashrom.c b/util/flashrom/flashrom.c
index a47bfa0754..8e1c3e44ed 100644
--- a/util/flashrom/flashrom.c
+++ b/util/flashrom/flashrom.c
@@ -242,7 +242,9 @@ int erase_flash(struct flashchip *flash)
return 0;
}
+#ifndef MAX
#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
#define POS_PRINT(x) do { pos += strlen(x); printf(x); } while (0)
void print_supported_chips(void)