From 72ba182fff763341313e5dc2a4ad8579d2396d1b Mon Sep 17 00:00:00 2001 From: Arnaud Le Blanc Date: Mon, 8 Apr 2024 14:58:12 +0200 Subject: [PATCH 1/2] Fix cookie_seek_function_t signature under musl (#13890) Fixes GH-11678 Upstream-Status: Backport [577b8ae4226368e66fee7a9b5c58f9e2428372fc] --- main/streams/cast.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/main/streams/cast.c b/main/streams/cast.c index 2109239effa..f0d65a141bd 100644 --- a/main/streams/cast.c +++ b/main/streams/cast.c @@ -104,6 +104,9 @@ static ssize_t stream_cookie_writer(void *cookie, const char *buffer, size_t siz # ifdef COOKIE_SEEKER_USES_OFF64_T static int stream_cookie_seeker(void *cookie, off64_t *position, int whence) +# else +static int stream_cookie_seeker(void *cookie, off_t *position, int whence) +# endif { *position = php_stream_seek((php_stream *)cookie, (zend_off_t)*position, whence); @@ -113,13 +116,6 @@ static int stream_cookie_seeker(void *cookie, off64_t *position, int whence) } return 0; } -# else -static int stream_cookie_seeker(void *cookie, zend_off_t position, int whence) -{ - - return php_stream_seek((php_stream *)cookie, position, whence); -} -# endif static int stream_cookie_closer(void *cookie) { -- 2.46.2