stdlib: Drop duplicates of min() and max()

Change-Id: Ib2f6fad735e085d237a0d46e0586e123eef6e0e2
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6161
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>

2 files changed, 3 insertions, 2 deletions

diff --git a/src/include/spi_flash.h b/src/include/spi_flash.h
index fe48d3b757..8e514719a1 100644
--- a/src/include/spi_flash.h
+++ b/src/include/spi_flash.h
@@ -39,8 +39,6 @@
 	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
 	(type *)( (char *)__mptr - offsetof(type,member) );})
 
-#define min(a, b) ((a)<(b)?(a):(b))
-
 #define CONFIG_ICH_SPI
 #ifdef CONFIG_ICH_SPI
 #define CONTROLLER_PAGE_LIMIT	64
diff --git a/src/include/stdlib.h b/src/include/stdlib.h
index cb5a6ca703..44d7c0126b 100644
--- a/src/include/stdlib.h
+++ b/src/include/stdlib.h
@@ -13,6 +13,9 @@
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 
+#define min(a,b) MIN((a),(b))
+#define max(a,b) MAX((a),(b))
+
 #if !defined(__PRE_RAM__)
 void *memalign(size_t boundary, size_t size);
 void *malloc(size_t size);