Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  [ci skip] NEWS
  Fix cookie_seek_function_t signature under musl (#13890)
This commit is contained in:
Arnaud Le Blanc 2024-04-08 15:02:32 +02:00
commit 618eb3d468

View File

@ -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)
{