]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Linux 5.1 compat: Drop ULLONG_MAX and LLONG_MAX definitions
authorTomohiro Kusumi <kusumi.tomohiro@gmail.com>
Tue, 7 May 2019 16:55:40 +0000 (01:55 +0900)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 7 May 2019 16:55:40 +0000 (09:55 -0700)
Linux kernel commit 54d50897d544c874562253e2a8f70dfcad22afe8
"linux/kernel.h: split *_MAX and *_MIN macros into <linux/limits.h>"

which first appeared in 5.1 has moved several macros from
<linux/kernel.h> to <linux/limits.h>. 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 <linux/kernel.h> 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 <rlaager@wiktel.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Closes #8714

include/spl/sys/types.h

index 483e3675152a943bff56a2a72749fc2527df381d..719a44646e6bb97e7910aa2b26c21bbd6f7dfd04 100644 (file)
 
 #include <linux/types.h>
 
-#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