From d6de92ef1ed8bcfc3660998b5ea0aaafc1d18678 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Sat, 30 Nov 2019 17:54:02 +0100 Subject: src/include: Remove min/max() from MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9ded44422a267e244343502dd5d6ab355e5a788d Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/coreboot/+/37378 Reviewed-by: Patrick Georgi Reviewed-by: Kyösti Mälkki Tested-by: build bot (Jenkins) --- src/include/stdlib.h | 3 --- src/vendorcode/cavium/bdk/libdram/dram-util.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/include/stdlib.h b/src/include/stdlib.h index 34ef93abc5..a8297f82a5 100644 --- a/src/include/stdlib.h +++ b/src/include/stdlib.h @@ -3,9 +3,6 @@ #include -#define min(a, b) MIN((a), (b)) -#define max(a, b) MAX((a), (b)) - void *memalign(size_t boundary, size_t size); void *malloc(size_t size); /* We never free memory */ diff --git a/src/vendorcode/cavium/bdk/libdram/dram-util.h b/src/vendorcode/cavium/bdk/libdram/dram-util.h index c9a96ba5ae..f8ab6c1552 100644 --- a/src/vendorcode/cavium/bdk/libdram/dram-util.h +++ b/src/vendorcode/cavium/bdk/libdram/dram-util.h @@ -42,8 +42,6 @@ * are not meant for users's of the libdram API. */ -#if 0 -/* FIXME(dhendrix): min/max are defined in stdlib.h */ /** * Standard min(a,b) macro */ @@ -58,7 +56,6 @@ #define max(X, Y) \ ({ typeof (X) __x = (X); typeof(Y) __y = (Y); \ (__x > __y) ? __x : __y; }) -#endif /** * Absolute value of an integer -- cgit v1.2.3