diff options
| author | Matthew Macy <[email protected]> | 2020-07-31 21:30:31 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-31 21:30:31 -0700 |
| commit | 47ed79ff60945e0c5d8ccb56f0d29a893e1261ac (patch) | |
| tree | af032038ad66d947e333ea55cf1383ce2627ea8b /lib/libspl/include/sys | |
| parent | 0cc3454821879396c38d8c557ab918a70afd919b (diff) | |
Changes to make openzfs build within FreeBSD buildworld
A collection of header changes to enable FreeBSD to build
with vendored OpenZFS.
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Matt Macy <[email protected]>
Closes #10635
Diffstat (limited to 'lib/libspl/include/sys')
| -rw-r--r-- | lib/libspl/include/sys/isa_defs.h | 2 | ||||
| -rw-r--r-- | lib/libspl/include/sys/uio.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/libspl/include/sys/isa_defs.h b/lib/libspl/include/sys/isa_defs.h index 6f242ea77..8c0932f57 100644 --- a/lib/libspl/include/sys/isa_defs.h +++ b/lib/libspl/include/sys/isa_defs.h @@ -208,7 +208,7 @@ extern "C" { #error MIPS no endian specified #endif -#ifndef _LP64 +#if !defined(_LP64) && !defined(_ILP32) #define _ILP32 #endif diff --git a/lib/libspl/include/sys/uio.h b/lib/libspl/include/sys/uio.h index 6d892dd3e..3a834b996 100644 --- a/lib/libspl/include/sys/uio.h +++ b/lib/libspl/include/sys/uio.h @@ -141,7 +141,8 @@ static inline offset_t uio_index_at_offset(uio_t *uio, offset_t off, uint_t *vec_idx) { *vec_idx = 0; - while (*vec_idx < uio_iovcnt(uio) && off >= uio_iovlen(uio, *vec_idx)) { + while (*vec_idx < (uint_t)uio_iovcnt(uio) && + off >= (offset_t)uio_iovlen(uio, *vec_idx)) { off -= uio_iovlen(uio, *vec_idx); (*vec_idx)++; } |