From bedc513fc2deddaf1e2724cccf4b11943437e6c9 Mon Sep 17 00:00:00 2001 From: Carl Smith Date: Wed, 13 Nov 2019 14:37:39 +1300 Subject: vcl: Handle newer Glibc (>2.28) where fcntl is actually fcntl64 Glibc 2.28 now provides fcntl64 which is used instead of fcntl by defining fcntl as fcntl64 in fcntl.h Type: fix Change-Id: I87fedfbf3e0d241aafdc920e90f824d71353e0e6 Signed-off-by: Carl Smith (cherry picked from commit e16707b5b2195fda47c1a3db7ba61f30055d2dbc) --- src/vcl/ldp.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/vcl/ldp.c') diff --git a/src/vcl/ldp.c b/src/vcl/ldp.c index 7aa38305249..e53a61e8e8c 100644 --- a/src/vcl/ldp.c +++ b/src/vcl/ldp.c @@ -482,8 +482,13 @@ writev (int fd, const struct iovec * iov, int iovcnt) return size; } +#ifdef HAVE_FCNTL64 +int +fcntl64 (int fd, int cmd, ...) +#else int fcntl (int fd, int cmd, ...) +#endif { vls_handle_t vlsh; int rv = 0; @@ -531,7 +536,11 @@ fcntl (int fd, int cmd, ...) } else { +#ifdef HAVE_FCNTL64 + rv = libc_vfcntl64 (fd, cmd, ap); +#else rv = libc_vfcntl (fd, cmd, ap); +#endif } va_end (ap); -- cgit 1.2.3-korg