Fix cookie_seek_function_t signature under musl (#13890)

arnaud-lb · web-flow · commit 577b8ae42263 · 2024-04-08T14:58:12.000+02:00
Fixes GH-11678
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,9 @@ static ssize_t stream_cookie_writer(void cookie, const char buffer, size_t siz`
`104`	`104`
`105`	`105`	`# ifdef COOKIE_SEEKER_USES_OFF64_T`
`106`	`106`	`static int stream_cookie_seeker(void cookie, off64_t position, int whence)`
	`107`	`+# else`
	`108`	`+static int stream_cookie_seeker(void cookie, off_t position, int whence)`
	`109`	`+# endif`
`107`	`110`	`{`
`108`	`111`
`109`	`112`	`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)`
`113`	`116`	`}`
`114`	`117`	`return 0;`
`115`	`118`	`}`
`116`		`-# else`
`117`		`-static int stream_cookie_seeker(void *cookie, zend_off_t position, int whence)`
`118`		`-{`
`119`		`-`
`120`		`- return php_stream_seek((php_stream *)cookie, position, whence);`
`121`		`-}`
`122`		`-# endif`
`123`	`119`
`124`	`120`	`static int stream_cookie_closer(void *cookie)`
`125`	`121`	`{`