From a00f80812e067aab0a53f29a82466b0ef15e2e2c Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Thu, 5 Nov 2020 09:33:03 +0100 Subject: [PATCH] linux: fix -Wincompatible-pointer-types warning `ssize_t` is 32 bits on 32 bits architectures, `off_t` is 64 bits (because libuv builds with `-D_LARGEFILE_SOURCE`.) Introduced in commit ca10e36149 ("linux: use copy_file_range for uv_fs_copyfile when possible") merged in July of this year. Fixes: https://github.com/libuv/libuv/issues/3011 PR-URL: https://github.com/libuv/libuv/pull/3028 Reviewed-By: Colin Ihrig Reviewed-By: Richard Lau --- src/unix/linux-syscalls.c | 4 ++-- src/unix/linux-syscalls.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/unix/linux-syscalls.c b/src/unix/linux-syscalls.c index 44daaf12..5ba3ffd6 100644 --- a/src/unix/linux-syscalls.c +++ b/src/unix/linux-syscalls.c @@ -222,9 +222,9 @@ int uv__dup3(int oldfd, int newfd, int flags) { ssize_t uv__fs_copy_file_range(int fd_in, - ssize_t* off_in, + off_t* off_in, int fd_out, - ssize_t* off_out, + off_t* off_out, size_t len, unsigned int flags) { diff --git a/src/unix/linux-syscalls.h b/src/unix/linux-syscalls.h index 761ff32e..c85231f6 100644 --- a/src/unix/linux-syscalls.h +++ b/src/unix/linux-syscalls.h @@ -66,9 +66,9 @@ ssize_t uv__pwritev(int fd, const struct iovec *iov, int iovcnt, int64_t offset) int uv__dup3(int oldfd, int newfd, int flags); ssize_t uv__fs_copy_file_range(int fd_in, - ssize_t* off_in, + off_t* off_in, int fd_out, - ssize_t* off_out, + off_t* off_out, size_t len, unsigned int flags); int uv__statx(int dirfd,