summaryrefslogtreecommitdiffstats
path: root/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
commitad216bf3a023569249069ec6dc5c93fd7bd741d7 (patch)
tree16c12a7c5a25d90047003143a6190a160f0e3e87 /flashrom.c
parent70ea9a326ac88bfb96f3b064aaa4ed69af902faf (diff)
downloadast2050-flashrom-ad216bf3a023569249069ec6dc5c93fd7bd741d7.zip
ast2050-flashrom-ad216bf3a023569249069ec6dc5c93fd7bd741d7.tar.gz
MAX may already be defined
Also, fix smaller cosmetics Corresponding to flashrom svn r442 and coreboot v2 svn r4205. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
Diffstat (limited to 'flashrom.c')
-rw-r--r--flashrom.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/flashrom.c b/flashrom.c
index a47bfa0..8e1c3e4 100644
--- a/flashrom.c
+++ b/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)
OpenPOWER on IntegriCloud