From 75346937de39f059722eedd29468ac9b86bea67c Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Wed, 8 May 2019 01:55:40 +0900 Subject: [PATCH] Linux 5.1 compat: Drop ULLONG_MAX and LLONG_MAX definitions Linux kernel commit 54d50897d544c874562253e2a8f70dfcad22afe8 "linux/kernel.h: split *_MAX and *_MIN macros into " which first appeared in 5.1 has moved several macros from to . This broke compilation due to header inclusion order against the local header include/spl/sys/types.h which also defines ULLONG_MAX and LLONG_MAX if undefined. It looks like local ULLONG_MAX and LLONG_MAX were never needed (or after spl integration ?) as has had the same definitions since an upstream commit 111ebb6e6f7bd7de6d722c5848e95621f43700d9 in 2.6.18, so drop them. -- linux/include/linux/limits.h:17: error: "LLONG_MAX" redefined [-Werror] #define LLONG_MAX ((long long)(~0ULL >> 1)) zfs/include/spl/sys/types.h:35: note: this is the location of the previous definition #define LLONG_MAX ((long long)(~0ULL>>1)) Reviewed-by: Richard Laager Reviewed-by: Brian Behlendorf Signed-off-by: Tomohiro Kusumi Closes #8714 --- include/spl/sys/types.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/spl/sys/types.h b/include/spl/sys/types.h index 483e367515..719a44646e 100644 --- a/include/spl/sys/types.h +++ b/include/spl/sys/types.h @@ -27,14 +27,6 @@ #include -#ifndef ULLONG_MAX -#define ULLONG_MAX (~0ULL) -#endif - -#ifndef LLONG_MAX -#define LLONG_MAX ((long long)(~0ULL>>1)) -#endif - typedef enum { B_FALSE = 0, B_TRUE = 1