aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-12-15 12:58:57 -0800
committerMarge Bot <emma+marge@anholt.net>2023-01-02 15:01:37 +0000
commit0d3f8dd6b4c3e40ca65a0b8f06f15ce0dbc1afc0 (patch)
treee0c74e3fa0ffb597e186eecf77b75c2b39389460
parentd637eebe75c4cad1df0cf37f3cfe2e1bc17b6c61 (diff)
downloadvirglrenderer-0d3f8dd6b4c3e40ca65a0b8f06f15ce0dbc1afc0.tar.gz
Replace lseek64 with lseek
meson defined _FILE_OFFSET_BITS=64 unconditionally, this implies that lseek and lseek64 are both same since they are using 64bit off_t, replacing lseek64 with lseek also helps in compiling with latest musl C library which has removed these from _GNU_SOURCE namespace unlike glibc where _GNU_SOURCE also implies _LARGEFILE64_SOURCE and the definition of lseek64 is still available. Signed-off-by: Khem Raj <raj.khem@gmail.com> Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1003>
-rw-r--r--src/proxy/proxy_context.c2
-rw-r--r--src/venus/vkr_context.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/proxy/proxy_context.c b/src/proxy/proxy_context.c
index f258a6fa..f254afe2 100644
--- a/src/proxy/proxy_context.c
+++ b/src/proxy/proxy_context.c
@@ -317,7 +317,7 @@ validate_resource_fd_shm(int fd, uint64_t expected_size)
return false;
}
- const uint64_t size = lseek64(fd, 0, SEEK_END);
+ const uint64_t size = lseek(fd, 0, SEEK_END);
if (size != expected_size) {
proxy_log("failed to validate shm size(%" PRIu64 ") expected(%" PRIu64 ")", size,
expected_size);
diff --git a/src/venus/vkr_context.c b/src/venus/vkr_context.c
index 8f8f876c..26dfaa0d 100644
--- a/src/venus/vkr_context.c
+++ b/src/venus/vkr_context.c
@@ -404,7 +404,7 @@ vkr_context_get_blob_locked(struct virgl_context *base,
return ret;
if (fd_type == VIRGL_RESOURCE_FD_DMABUF &&
- (uint64_t)lseek64(fd, 0, SEEK_END) < blob_size) {
+ (uint64_t)lseek(fd, 0, SEEK_END) < blob_size) {
close(fd);
return -EINVAL;
}