Patch-Source: https://github.com/php/php-src/issues/11678 diff --git a/main/streams/cast.c b/main/streams/cast.c index 3bad65fbac..05cab34658 100644 --- a/main/streams/cast.c +++ b/main/streams/cast.c @@ -102,8 +102,7 @@ static ssize_t stream_cookie_writer(void *cookie, const char *buffer, size_t siz return php_stream_write(((php_stream *)cookie), (char *)buffer, size); } -# ifdef COOKIE_SEEKER_USES_OFF64_T -static int stream_cookie_seeker(void *cookie, off64_t *position, int whence) +static int stream_cookie_seeker(void *cookie, off_t *position, int whence) { *position = php_stream_seek((php_stream *)cookie, (zend_off_t)*position, whence); @@ -113,13 +112,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) { --- a/ext/zend_test/test.c +++ b/ext/zend_test/test.c @@ -1254,9 +1254,9 @@ /** * This function allows us to simulate early return of copy_file_range by setting the limit_copy_file_range ini setting. */ -PHP_ZEND_TEST_API ssize_t copy_file_range(int fd_in, off64_t *off_in, int fd_out, off64_t *off_out, size_t len, unsigned int flags) +PHP_ZEND_TEST_API ssize_t copy_file_range(int fd_in, off_t *off_in, int fd_out, off_t *off_out, size_t len, unsigned int flags) { - ssize_t (*original_copy_file_range)(int, off64_t *, int, off64_t *, size_t, unsigned int) = dlsym(RTLD_NEXT, "copy_file_range"); + ssize_t (*original_copy_file_range)(int, off_t *, int, off_t *, size_t, unsigned int) = dlsym(RTLD_NEXT, "copy_file_range"); if (ZT_G(limit_copy_file_range) >= Z_L(0)) { len = ZT_G(limit_copy_file_range); }