diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/btree.c | 1 | ||||
| -rw-r--r-- | lib/decompress_unlzma.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/btree.c b/lib/btree.c index 49420cae3a8330..bb81d3393ac5c5 100644 --- a/lib/btree.c +++ b/lib/btree.c @@ -43,7 +43,6 @@ #include <linux/slab.h> #include <linux/module.h> -#define MAX(a, b) ((a) > (b) ? (a) : (b)) #define NODESIZE MAX(L1_CACHE_BYTES, 128) struct btree_geo { diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c index 20a858031f12b7..9d34d35908daa8 100644 --- a/lib/decompress_unlzma.c +++ b/lib/decompress_unlzma.c @@ -37,7 +37,9 @@ #include <linux/decompress/mm.h> +#ifndef MIN #define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#endif static long long INIT read_int(unsigned char *ptr, int size) { |