From ad216bf3a023569249069ec6dc5c93fd7bd741d7 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Fri, 24 Apr 2009 16:17:41 +0000
Subject: 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>
---
 flashrom.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'flashrom.c')

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)
-- 
cgit v1.1